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
This commit is contained in:
parent
56fa083954
commit
eb2ac2eb27
10
.classpath
10
.classpath
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<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>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</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>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
@ -34,10 +34,10 @@
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
|
<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>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="owner.project.facets" value="java"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</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>
|
</classpath>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||||
org.eclipse.jdt.core.compiler.compliance=1.7
|
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||||
org.eclipse.jdt.core.compiler.source=1.7
|
org.eclipse.jdt.core.compiler.source=1.8
|
||||||
|
|
|
@ -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="/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="/target/generated-sources/gwt"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
<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="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
||||||
<property name="context-root" value="service-endpoint-editor"/>
|
<property name="context-root" value="service-endpoint-editor"/>
|
||||||
</wb-module>
|
</wb-module>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<faceted-project>
|
<faceted-project>
|
||||||
<fixed facet="wst.jsdt.web"/>
|
<fixed facet="wst.jsdt.web"/>
|
||||||
<installed facet="wst.jsdt.web" version="1.0"/>
|
<installed facet="wst.jsdt.web" version="1.0"/>
|
||||||
<installed facet="java" version="1.7"/>
|
|
||||||
<installed facet="liferay.portlet" version="6.0"/>
|
<installed facet="liferay.portlet" version="6.0"/>
|
||||||
<installed facet="jst.web" version="3.0"/>
|
<installed facet="jst.web" version="3.0"/>
|
||||||
|
<installed facet="java" version="1.8"/>
|
||||||
</faceted-project>
|
</faceted-project>
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
<ReleaseNotes>
|
<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"
|
<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.2-3-0"
|
||||||
date="2017-06-28">
|
date="2017-06-28">
|
||||||
<Change>Added map for ParthenosVO</Change>
|
<Change>Added map for ParthenosVO</Change>
|
||||||
|
|
6
pom.xml
6
pom.xml
|
@ -13,7 +13,7 @@
|
||||||
<groupId>org.gcube.portlets.admin</groupId>
|
<groupId>org.gcube.portlets.admin</groupId>
|
||||||
<artifactId>service-endpoint-editor</artifactId>
|
<artifactId>service-endpoint-editor</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>2.3.0-SNAPSHOT</version>
|
<version>2.4.0-SNAPSHOT</version>
|
||||||
<name>gCube Service End Point Editor Management Portlet</name>
|
<name>gCube Service End Point Editor Management Portlet</name>
|
||||||
<description>
|
<description>
|
||||||
gCube Service End Point Editor Management Portlet
|
gCube Service End Point Editor Management Portlet
|
||||||
|
@ -202,8 +202,8 @@
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>2.3.2</version>
|
<version>2.3.2</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.7</source>
|
<source>1.8</source>
|
||||||
<target>1.7</target>
|
<target>1.8</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!-- SA Plugin -->
|
<!-- SA Plugin -->
|
||||||
|
|
|
@ -145,7 +145,7 @@ public class RuntimeResourceCreatorServiceImpl extends RemoteServiceServlet impl
|
||||||
System.out.println("Updating " + rs.getResourceId());
|
System.out.println("Updating " + rs.getResourceId());
|
||||||
for (String scope2Update: rt.scopes()) {
|
for (String scope2Update: rt.scopes()) {
|
||||||
ScopeProvider.instance.set(scope2Update);
|
ScopeProvider.instance.set(scope2Update);
|
||||||
publisher.update(rt);
|
publisher.vosUpdate(rt);
|
||||||
System.out.println("Updated " + rs.getResourceId() + " on " + scope2Update);
|
System.out.println("Updated " + rs.getResourceId() + " on " + scope2Update);
|
||||||
}
|
}
|
||||||
_log.trace("Updated RR sent");
|
_log.trace("Updated RR sent");
|
||||||
|
|
|
@ -14,11 +14,6 @@
|
||||||
<src>ServiceMap_D4Research.xml</src>
|
<src>ServiceMap_D4Research.xml</src>
|
||||||
<scope>/d4science.research-infrastructures.eu/D4Research</scope>
|
<scope>/d4science.research-infrastructures.eu/D4Research</scope>
|
||||||
</vo>
|
</vo>
|
||||||
<vo>
|
|
||||||
<name>d4science/Edison</name>
|
|
||||||
<src>ServiceMap_Edison.xml</src>
|
|
||||||
<scope>/d4science.research-infrastructures.eu/Edison</scope>
|
|
||||||
</vo>
|
|
||||||
<vo>
|
<vo>
|
||||||
<name>d4science/FARM</name>
|
<name>d4science/FARM</name>
|
||||||
<src>ServiceMap_FARM.xml</src>
|
<src>ServiceMap_FARM.xml</src>
|
||||||
|
@ -78,20 +73,4 @@
|
||||||
</vos>
|
</vos>
|
||||||
</infrastructure>
|
</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>
|
</infrastructures>
|
||||||
|
|
Loading…
Reference in New Issue