From d9f8869208b5b76821490ee899f2a8ef8c5b8751 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 9 Jun 2015 15:55:59 +0000
Subject: [PATCH] Fix for Incident #187, remove scope operation not passing
 through Resource Manager

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@115275 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                 | 4 ++--
 .settings/org.eclipse.wst.common.component | 2 +-
 distro/changelog.xml                       | 4 ++++
 pom.xml                                    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.classpath b/.classpath
index 5c1ca82..c002ed2 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/resource-management-5.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/resource-management-5.4.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -36,5 +36,5 @@
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/rmp-common-library"/>
-	<classpathentry kind="output" path="target/resource-management-5.4.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/resource-management-5.4.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index bbdbb21..659eec6 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,7 +3,7 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <dependent-module archiveName="rmp-common-library-2.2.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
+        <dependent-module archiveName="rmp-common-library-2.2.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index a5d7219..deb3e14 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,5 +1,9 @@
 <ReleaseNotes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="xsd/changelog.xsd">
+	<Changeset
+		component="org.gcube.portlets-admin.resource-management-portlet.5-4-1" date="2015-06-09">
+			<Change>Fix for Incident #187, remove scope operation not passing through Resource Manager</Change>
+	</Changeset>
 	<Changeset
 		component="org.gcube.portlets-admin.resource-management-portlet.5-4-0" date="2015-04-21">
 		<Change>fixed Ticket #1119 Resource Management / Monitor wrong generic resource query</Change>
diff --git a/pom.xml b/pom.xml
index faff41c..5033e54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>resource-management</artifactId>
-	<version>5.4.0-SNAPSHOT</version>
+	<version>5.4.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>gCube Resource Management Portlet</name>
 	<description>