diff --git a/.classpath b/.classpath
index 4b9b5f8..7708023 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -34,10 +34,10 @@
-
+
-
+
-
+
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 @@
+
+ uses
+
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 @@
-
+
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 @@
+
+ Feature #12726
+ Infrastructure-monitor: update resource at vo level rather than vre level
+
Added map for ParthenosVO
diff --git a/pom.xml b/pom.xml
index 2586f97..6b81d19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
org.gcube.portlets.admin
service-endpoint-editor
war
- 2.3.0-SNAPSHOT
+ 2.4.0-SNAPSHOT
gCube Service End Point Editor Management Portlet
gCube Service End Point Editor Management Portlet
@@ -202,8 +202,8 @@
maven-compiler-plugin
2.3.2
-
- 1.7
+
+ 1.8
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 @@
ServiceMap_D4Research.xml
/d4science.research-infrastructures.eu/D4Research
-
- d4science/Edison
- ServiceMap_Edison.xml
- /d4science.research-infrastructures.eu/Edison
-
d4science/FARM
ServiceMap_FARM.xml
@@ -78,20 +73,4 @@
-
- CNR.it
-
-
- CNR.it
- ServiceMap_CNR.it.xml
- /CNR.it
-
-
- CNR.it/ISTI
- ServiceMap_ISTI.xml
- /CNR.it/ISTI
-
-
-
-