updated version for gCube gCore Free Portal

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@96948 82a268e6-3cf1-43bd-a215-b396298e98cf
2014-06-06 12:58:34 +00:00 · 2014-06-06 12:58:34 +00:00 · d9b94645e7
parent 7ec77482ed
commit d9b94645e7
11 changed files with 79 additions and 53 deletions
--- a/.classpath
+++ b/.classpath
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/resource-management-5.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/resource-management-5.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@ -23,11 +23,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@ -36,5 +31,10 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA.jar" sourcepath="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/resource-management-5.1.0-SNAPSHOT/WEB-INF/classes"/>
+	<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"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/resource-management-5.2.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.1.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.2.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@ -1,9 +1,8 @@
-#Wed Feb 27 16:47:37 CET 2013
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 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.6
+org.eclipse.jdt.core.compiler.source=1.7
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
  <wb-module deploy-name="${module}">
        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
    <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@ -2,6 +2,6 @@
 <faceted-project>
  <fixed facet="wst.jsdt.web"/>
  <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.6"/>
  <installed facet="jst.web" version="2.5"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>
--- 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-servicearchive.5-2-0" date="2014-06-06">
+		<Change>Ported to gCore Free Portal</Change>
+	</Changeset>
 	<Changeset
 		component="org.gcube.portlets-admin.resource-management-portlet-servicearchive.5-1-0"
 		date="2013-10-21">
--- a/pom.xml
+++ b/pom.xml
@ -12,7 +12,7 @@

 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>resource-management</artifactId>
-	<version>5.1.0-SNAPSHOT</version>
+	<version>5.2.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>gCube Resource Management Portlet</name>
 	<description>
@ -29,8 +29,8 @@
 		<guice.version>3.0</guice.version>
 		<distroDirectory>distro</distroDirectory>
 		<!-- GWT needs at least java 1.6 -->
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.7</maven.compiler.source>
+		<maven.compiler.target>1.7</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 GLOBUS_LOCATION /Users/massi/portal/Portal-Bundle/gCore" 
@ -64,11 +64,6 @@
 			<artifactId>gwt-servlet</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>xalan</groupId>
-			<artifactId>xalan</artifactId>
-			<!-- <version>2.7.1</version> -->
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>
@ -83,14 +78,13 @@
 			<groupId>com.sencha.gxt</groupId>
 			<artifactId>gxt</artifactId>
 			<version>2.2.5</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.googlecode.gwtquery</groupId>
 			<artifactId>gwtquery</artifactId>
 			<version>1.3.3</version>
 		</dependency>
-			<dependency>
+		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslcore</artifactId>
 			<scope>provided</scope>
@ -108,6 +102,7 @@
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>
 			<artifactId>usermanagement-core</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.admin</groupId>
@ -122,20 +117,17 @@
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
-			<artifactId>common-fw-clients</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<artifactId>common-fw-clients</artifactId>			
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
-			<artifactId>common-clients</artifactId>
-			<version>[2.0.2-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+			<artifactId>common-clients</artifactId>			
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
-			<artifactId>common-scope-maps</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<artifactId>common-scope-maps</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resourcemanagement</groupId>
@ -144,8 +136,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resources</groupId>
-			<artifactId>registry-publisher</artifactId>
-			<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<artifactId>registry-publisher</artifactId>			
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@ -189,37 +180,29 @@
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
 			<version>${guice.version}</version>
-			<scope>provided</scope>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject.extensions</groupId>
 			<artifactId>guice-servlet</artifactId>
 			<version>${guice.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.0.13</version>
-			<scope>provided</scope>
+			<scope>compile</scope>
 		</dependency>
 		<!-- gwt-dispatch -->
 		<dependency>
 			<groupId>net.customware.gwt.dispatch</groupId>
 			<artifactId>gwt-dispatch</artifactId>
-			<scope>provided</scope>
+			<version>1.2.0</version>
 		</dependency>
 		<!-- Liferay, Servlets Etc -->
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>javax.mail-api</artifactId>
 			<version>1.4.5</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
 			<artifactId>portal-service</artifactId>
-			<version>6.0.6</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@ -236,17 +219,17 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<scope>provided</scope>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<scope>provided</scope>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<scope>provided</scope>
+			<scope>compile</scope>
 		</dependency>
 		<!-- Logging -->
 		<dependency>
@ -267,7 +250,8 @@
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
 			<artifactId>gwt-log</artifactId>
-			<scope>provided</scope>
+			 <version>3.1.7</version>
+			<scope>compile</scope>
 		</dependency>
 	</dependencies>

@ -322,8 +306,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 			<!-- SA Plugin -->
--- a/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
@ -3,7 +3,9 @@
 	<!-- Inherit the core Web Toolkit stuff. -->
 	<inherits name='com.google.gwt.user.User' />

-<!-- 	<set-property name="user.agent" value="gecko1_8" /> -->
+	<!-- To Comment out -->
+	<set-property name="user.agent" value="safari,gecko1_8,ie9" />
+
 	<!-- Other module inherits -->
 	<inherits name='com.extjs.gxt.ui.GXT' />
 <inherits name='com.google.gwt.query.Query' />
--- a/src/main/webapp/WEB-INF/xml/scopedata.xml
+++ b/src/main/webapp/WEB-INF/xml/scopedata.xml
@ -47,5 +47,21 @@
 			</vo>
 		</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>
--- a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
+++ b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
@ -22,7 +22,8 @@
 			<vo>
 				<name>d4science/EUBrazilOpenBio</name>
 				<src>ServiceMap_EUBrazilOpenBio.xml</src>
-				<scope>/d4science.research-infrastructures.eu/EUBrazilOpenBio</scope>
+				<scope>/d4science.research-infrastructures.eu/EUBrazilOpenBio
+				</scope>
 			</vo>
 		</vos>
 	</infrastructure>
@ -45,6 +46,27 @@
 				<src>ServiceMap_devNext.xml</src>
 				<scope>/gcube/devNext</scope>
 			</vo>
+			<vo>
+				<name>gcube/secureVO</name>
+				<src>ServiceMap_secureVO.xml</src>
+				<scope>/gcube/secureVO</scope>
+			</vo>
+		</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>

--- a/src/main/webapp/coherence.css
+++ b/src/main/webapp/coherence.css
@ -58,7 +58,7 @@
 	color: #4c68a6;
 	font-family: "HelveticaNeue-Light", "Helvetica Neue Light",
 		"Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-	font-weight: 500;
+	font-weight: normal;
 	font-size: 12px !important;
 }