From eb2ac2eb27bdf5a1166bf4d5ee1d644a00e40535 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 6 Nov 2018 11:12:05 +0000
Subject: [PATCH] Feature #12726, update resource at vo level rather than vre
 level

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/service-endpoint-editor@173973 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    | 10 ++++-----
 .settings/org.eclipse.jdt.core.prefs          |  6 +++---
 .settings/org.eclipse.wst.common.component    |  3 +++
 ....eclipse.wst.common.project.facet.core.xml |  2 +-
 distro/changelog.xml                          |  5 +++++
 pom.xml                                       |  6 +++---
 .../RuntimeResourceCreatorServiceImpl.java    |  2 +-
 .../webapp/WEB-INF/xml/scopedata_admin.xml    | 21 -------------------
 8 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/.classpath b/.classpath
index 4b9b5f8..7708023 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/service-endpoint-editor-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/service-endpoint-editor-2.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/service-endpoint-editor-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/service-endpoint-editor-2.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -34,10 +34,10 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/service-endpoint-editor-2.3.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/service-endpoint-editor-2.4.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 443e085..6e80039 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 52c4cb6..9e01acd 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,6 +5,9 @@
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <dependent-module archiveName="rmp-common-library-2.8.1-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"/>
         <property name="context-root" value="service-endpoint-editor"/>
   </wb-module>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index c57a49e..15eea05 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,7 +2,7 @@
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.7"/>
   <installed facet="liferay.portlet" version="6.0"/>
   <installed facet="jst.web" version="3.0"/>
+  <installed facet="java" version="1.8"/>
 </faceted-project>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 91fe77c..d003573 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.2-4-0"
+		date="2018-11-05">
+		<Change>Feature #12726
+			Infrastructure-monitor: update resource at vo level rather than vre level</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.2-3-0"
 		date="2017-06-28">
 		<Change>Added map for ParthenosVO</Change>
diff --git a/pom.xml b/pom.xml
index 2586f97..6b81d19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>service-endpoint-editor</artifactId>
 	<packaging>war</packaging>
-	<version>2.3.0-SNAPSHOT</version>
+	<version>2.4.0-SNAPSHOT</version>
 	<name>gCube Service End Point Editor Management Portlet</name>
 	<description>
 		gCube Service End Point Editor Management Portlet
@@ -202,8 +202,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<!-- SA Plugin -->
diff --git a/src/main/java/org/gcube/portlets/admin/sepeditor/server/RuntimeResourceCreatorServiceImpl.java b/src/main/java/org/gcube/portlets/admin/sepeditor/server/RuntimeResourceCreatorServiceImpl.java
index 297cb61..ea25572 100644
--- a/src/main/java/org/gcube/portlets/admin/sepeditor/server/RuntimeResourceCreatorServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/admin/sepeditor/server/RuntimeResourceCreatorServiceImpl.java
@@ -145,7 +145,7 @@ public class RuntimeResourceCreatorServiceImpl extends RemoteServiceServlet impl
 				System.out.println("Updating " + rs.getResourceId());
 				for (String scope2Update: rt.scopes()) {
 					ScopeProvider.instance.set(scope2Update);
-					publisher.update(rt);
+					publisher.vosUpdate(rt);
 					System.out.println("Updated " + rs.getResourceId() + " on " + scope2Update);
 				}
 				_log.trace("Updated RR sent");
diff --git a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
index 3acffac..d394304 100644
--- a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
+++ b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
@@ -14,11 +14,6 @@
 				<src>ServiceMap_D4Research.xml</src>
 				<scope>/d4science.research-infrastructures.eu/D4Research</scope>
 			</vo>
-			<vo>
-				<name>d4science/Edison</name>
-				<src>ServiceMap_Edison.xml</src>
-				<scope>/d4science.research-infrastructures.eu/Edison</scope>
-			</vo>
 			<vo>
 				<name>d4science/FARM</name>
 				<src>ServiceMap_FARM.xml</src>
@@ -78,20 +73,4 @@
 		</vos>
 	</infrastructure>
 
-	<infrastructure>
-		<name>CNR.it</name>
-		<vos>
-			<vo>
-				<name>CNR.it</name>
-				<src>ServiceMap_CNR.it.xml</src>
-				<scope>/CNR.it</scope>
-			</vo>
-			<vo>
-				<name>CNR.it/ISTI</name>
-				<src>ServiceMap_ISTI.xml</src>
-				<scope>/CNR.it/ISTI</scope>
-			</vo>
-		</vos>
-	</infrastructure>
-
 </infrastructures>