From 138fc00e1095680f98dfdb2f934c01f5cbbe2777 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Fri, 30 Jun 2017 12:16:06 +0000
Subject: [PATCH] added maps for ParthenosVO

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@150650 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                           | 10 +++++-----
 .settings/org.eclipse.wst.common.component           |  9 ---------
 .../org.eclipse.wst.common.project.facet.core.xml    |  2 +-
 pom.xml                                              | 12 +++++++-----
 src/main/webapp/WEB-INF/xml/scopedata.xml            |  5 +++++
 src/main/webapp/WEB-INF/xml/scopedata_admin.xml      |  5 +++++
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/.classpath b/.classpath
index f61fed3..87e3b03 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/resource-management-6.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/resource-management-6.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/resource-management-6.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/resource-management-6.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -33,11 +33,11 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</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">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry kind="output" path="target/resource-management-6.3.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/resource-management-6.4.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index a6d6af1..83aa556 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,15 +4,6 @@
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="rmp-common-library-2.7.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="ishealth-monitor-widget-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/resource-ishealth-monitor/resource-ishealth-monitor">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="resource-sweeper-widget-2.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/resource-sweeper/resource-sweeper">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="resource-management"/>
   </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 9716eab..ff39cb9 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,7 +3,7 @@
   <fixed facet="wst.jsdt.web"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.web" version="2.5"/>
-  <installed facet="java" version="1.7"/>
   <installed facet="liferay.portlet" version="6.0"/>
   <installed facet="jst.jaxrs" version="2.0"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>
diff --git a/pom.xml b/pom.xml
index cbf516c..be400dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>resource-management</artifactId>
-	<version>6.3.0-SNAPSHOT</version>
+	<version>6.4.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>gCube Resource Management Portlet</name>
 	<description>
@@ -30,7 +30,7 @@
 		<guice.version>3.0</guice.version>
 		<distroDirectory>distro</distroDirectory>
 		<maven.compiler.source>1.7</maven.compiler.source>
-		<maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.target>1.8</maven.compiler.target>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
 		<!-- To make this work on gwt-run you need to set up global env vars. on 
 			MacOSX edit this file /etc/launchd.conf and put "setenv CATALINA_HOME /Users/massi/portal/Portal-Bundle/gCore" 
@@ -118,6 +118,7 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
+			<version>[1.0.7-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -234,7 +235,8 @@
 				<!-- Plugin configuration. There are many available options, see gwt-maven-plugin 
 					documentation at codehaus.org -->
 				<configuration>
-					<extraJvmArgs>-Xmx512M -DGLOBUS_LOCATION=${GLOBUS_LOCATION} -Dlog4j.configuration=clientlog4j.properties</extraJvmArgs>
+					<extraJvmArgs>-Xmx512M -DGLOBUS_LOCATION=${GLOBUS_LOCATION}
+						-Dlog4j.configuration=clientlog4j.properties</extraJvmArgs>
 					<runTarget>ResourceManagementPortlet.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
 					<!-- <logLevel>DEBUG</logLevel> -->
@@ -263,8 +265,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
 				</configuration>
 			</plugin>
 			<!-- SA Plugin -->
diff --git a/src/main/webapp/WEB-INF/xml/scopedata.xml b/src/main/webapp/WEB-INF/xml/scopedata.xml
index f10a5be..486e1f8 100644
--- a/src/main/webapp/WEB-INF/xml/scopedata.xml
+++ b/src/main/webapp/WEB-INF/xml/scopedata.xml
@@ -33,6 +33,11 @@
 				<name>d4science/OpenAIRE</name>
 				<src>ServiceMap_OpenAIRE.xml</src>
 				<scope>/d4science.research-infrastructures.eu/OpenAIRE</scope>
+			</vo>
+			<vo>
+				<name>d4science/ParthenosVO</name>
+				<src>ServiceMap_ParthenosVO.xml</src>
+				<scope>/d4science.research-infrastructures.eu/ParthenosVO</scope>
 			</vo>						
 			<vo>
 				<name>d4science/SmartArea</name>
diff --git a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
index f10a5be..486e1f8 100644
--- a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
+++ b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
@@ -33,6 +33,11 @@
 				<name>d4science/OpenAIRE</name>
 				<src>ServiceMap_OpenAIRE.xml</src>
 				<scope>/d4science.research-infrastructures.eu/OpenAIRE</scope>
+			</vo>
+			<vo>
+				<name>d4science/ParthenosVO</name>
+				<src>ServiceMap_ParthenosVO.xml</src>
+				<scope>/d4science.research-infrastructures.eu/ParthenosVO</scope>
 			</vo>						
 			<vo>
 				<name>d4science/SmartArea</name>