2.14

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@74098 82a268e6-3cf1-43bd-a215-b396298e98cf

.settings/org.eclipse.wst.common.component

@@ -4,6 +4,9 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <dependent-module archiveName="software-upload-wizard-1.1.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/software-upload-wizard/software-upload-wizard">
+            <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>

distro/changelog.xml

@@ -2,7 +2,7 @@
 	xsi:noNamespaceSchemaLocation="xsd/changelog.xsd">
 	<Changeset
 		component="org.gcube.portlets-admin.resource-management-portlet-servicearchive.4-1-0"
-		date="2013-02-27">
+		date="2013-04-19">
 		<Change>added activation record widget as external module</Change>
 	</Changeset>
 	<Changeset

pom.xml

@@ -16,7 +16,7 @@
 	<packaging>war</packaging>
 	<name>gCube Resource Management Portlet</name>
 	<description>
-		Cube Resource Management Portlet
+		gCube Resource Management Portlet
 	</description>
 	<scm>
 		<connection>scm:svn:http://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/${project.artifactId}</connection>
@@ -32,11 +32,9 @@
 		<maven.compiler.source>1.6</maven.compiler.source>
 		<maven.compiler.target>1.6</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 
-			To make this work on gwt-run you need to set up global env vars.
+			MacOSX edit this file /etc/launchd.conf and put "setenv GLOBUS_LOCATION /Users/massi/portal/Portal-Bundle/gCore" 
-			on MacOSX edis this file /etc/launchd.conf and put setenv GLOBUS_LOCATION /Users/massi/portal/Portal-Bundle/gCore 
+			on Linux? -->
-			on Linux?
-		 -->
 		<GLOBUS_LOCATION>${env.GLOBUS_LOCATION}</GLOBUS_LOCATION>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -135,6 +133,7 @@
 			<artifactId>rmp-common-library</artifactId>
 			<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
+		<!-- External Modules -->
 		<dependency>
 			<groupId>org.gcube.portlets.admin</groupId>
 			<artifactId>ishealth-monitor-widget</artifactId>
@@ -155,12 +154,27 @@
 			<artifactId>activation-record-widgets</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>		
+		<!-- guice -->
 		<dependency>
-			<groupId>com.allen-sauer.gwt.log</groupId>
+			<groupId>com.google.inject</groupId>
-			<artifactId>gwt-log</artifactId>
+			<artifactId>guice</artifactId>
-			<version>3.1.7</version>
+			<version>${guice.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.google.inject.extensions</groupId>
+			<artifactId>guice-servlet</artifactId>
+			<version>${guice.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- gwt-dispatch -->
+		<dependency>
+			<groupId>net.customware.gwt.dispatch</groupId>
+			<artifactId>gwt-dispatch</artifactId>
+			<version>1.2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- Liferay, Servlets Etc -->
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>javax.mail-api</artifactId>
@@ -173,24 +187,6 @@
 			<version>6.0.6</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.16</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.6.4</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.6.4</version>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>javax.portlet</groupId>
 			<artifactId>portlet-api</artifactId>
@@ -222,24 +218,30 @@
 			<version>2.4</version>
 			<scope>provided</scope>
 		</dependency>
+		<!-- Logging -->
 		<dependency>
-			<groupId>junit</groupId>
+			<groupId>log4j</groupId>
-			<artifactId>junit</artifactId>
+			<artifactId>log4j</artifactId>
-			<version>4.7</version>
+			<version>1.2.16</version>
-			<scope>test</scope>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.validation</groupId>
+			<groupId>org.slf4j</groupId>
-			<artifactId>validation-api</artifactId>
+			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.0.0.GA</version>
+			<version>1.6.4</version>
-			<scope>test</scope>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.validation</groupId>
+			<groupId>org.slf4j</groupId>
-			<artifactId>validation-api</artifactId>
+			<artifactId>slf4j-api</artifactId>
-			<version>1.0.0.GA</version>
+			<version>1.6.4</version>
-			<classifier>sources</classifier>
+			<scope>runtime</scope>
-			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.allen-sauer.gwt.log</groupId>
+			<artifactId>gwt-log</artifactId>
+			<version>3.1.7</version>
+			<scope>provided</scope>
 		</dependency>		
 	</dependencies>
 
@@ -268,6 +270,7 @@
 					<extraJvmArgs>-Xmx512M -DGLOBUS_LOCATION=${GLOBUS_LOCATION}</extraJvmArgs>
 					<runTarget>ResourceManagementPortlet.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
+<!-- 					<logLevel>DEBUG</logLevel> -->
 				</configuration>
 			</plugin>
 

src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml

@@ -3,7 +3,7 @@
 	<!-- Inherit the core Web Toolkit stuff. -->
 	<inherits name='com.google.gwt.user.User' />
 
-	<!-- <set-property name="user.agent" value="gecko1_8" /> -->
+	<set-property name="user.agent" value="gecko1_8" />