From 50435c4f8f725bc171021c1004db2b41a422aef0 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 2 Oct 2015 12:42:33 +0000
Subject: [PATCH] 429: Workspace: uploading big files

Task-Url: https://support.d4science.org/issues/429

Updated pom and distro

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@119345 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    |  10 +-
 .settings/org.eclipse.wst.common.component    |   1 -
 distro/README                                 |   4 +-
 distro/descriptor.xml                         |   2 +-
 distro/profile.xml                            |  10 +-
 pom.xml                                       | 120 ++++++++++--------
 .../WorkspaceUploader.gwt.xml                 |   3 +-
 .../WorkspaceUploader.gwt.xml                 |   3 +-
 8 files changed, 76 insertions(+), 77 deletions(-)

diff --git a/.classpath b/.classpath
index c78cf73..3e304a6 100644
--- a/.classpath
+++ b/.classpath
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/workspace-uploader-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry including="**/*.java" kind="src" output="target/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/workspace-uploader-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -30,9 +25,8 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/francesco-mangiacrapa/libraries/asm-5.0.3/lib/asm-5.0.3.jar"/>
-	<classpathentry kind="output" path="target/workspace-uploader-1.0.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index cd2a508..d5bd59d 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,7 +3,6 @@
         <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"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <property name="context-root" value="workspace-uploader"/>
         <property name="java-output-path" value="/workspace-uploader-TRUNK/target/workspace-uploader-1.0.0-SNAPSHOT/WEB-INF/classes"/>
     </wb-module>
diff --git a/distro/README b/distro/README
index e0bc42d..addb02d 100644
--- a/distro/README
+++ b/distro/README
@@ -1,4 +1,4 @@
-The gCube System - WorkspacePortlet
+The gCube System - Workspace Uploader
 ------------------------------------------------------------
 
 This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2),  
@@ -16,7 +16,7 @@ Authors
 Version and Release Date
 ------------------------
 
-v. 6.8.0 July 2015
+v. 1.0.0 October 2015
  
 
 Description
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index 4efc827..c468f13 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -36,7 +36,7 @@
 			<filtered>true</filtered>
 		</file>
 		<file>
-			<source>target/${build.finalName}.war</source>
+			<source>target/${build.finalName}.jar</source>
 			<outputDirectory>/${artifactId}</outputDirectory>
 		</file>
 		<file>
diff --git a/distro/profile.xml b/distro/profile.xml
index 51c3b6b..a8e8deb 100644
--- a/distro/profile.xml
+++ b/distro/profile.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<ID></ID>
-	<Type>Service</Type>
+	<Type>Library</Type>
 	<Profile>
 		<Description>${description}</Description>
-		<Class>PortletUser</Class>
+		<Class>PortletsWidgets</Class>
 		<Name>${artifactId}</Name>
-		<Version>${version}</Version>
+		<Version>1.0.0</Version>
 		<Packages>
 			<Software>
 				<Name>${artifactId}</Name>
@@ -17,9 +17,9 @@
 					<version>${version}</version>
 				</MavenCoordinates>
 				<Files>
-					<File>target/${build.finalName}.war</File>
+					<File>${build.finalName}.jar</File>
 				</Files>
 			</Software>
 		</Packages>
 	</Profile>
-</Resource>
+</Resource>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2d6373f..f8f7023 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>workspace-uploader</artifactId>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 	<version>1.0.0-SNAPSHOT</version>
 	<name>Workspace Uploader Widget</name>
 	<scm>
@@ -201,79 +201,44 @@
 		</dependency>
 	</dependencies>
 	<build>
-
-		<!-- Generate compiled stuff in the folder used for developing mode -->
-		<outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
-
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.*</include>
+				</includes>
+			</resource>
+		</resources>
 		<plugins>
-
-			<!-- GWT Maven Plugin -->
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>gwt-maven-plugin</artifactId>
-				<version>${gwtVersion}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>compile</goal>
-							<!-- <goal>test</goal> -->
-						</goals>
-					</execution>
-				</executions>
-				<!-- Plugin configuration. There are many available options, see gwt-maven-plugin 
-					documentation at codehaus.org -->
-				<configuration>
-					<runTarget>WorkspacePortlet.html</runTarget>
-					<hostedWebapp>${webappDirectory}</hostedWebapp>
-				</configuration>
-			</plugin>
-
-			<!-- Copy static web files before executing gwt:run -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.1.1</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<goals>
-							<goal>exploded</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<webappDirectory>${webappDirectory}</webappDirectory>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
 				<configuration>
 					<source>${maven.compiler.source}</source>
 					<target>${maven.compiler.target}</target>
 				</configuration>
 			</plugin>
-			<!-- SA Plugin -->
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
+				<artifactId>maven-jar-plugin</artifactId>
 				<version>2.2</version>
-				<configuration>
-					<descriptors>
-						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-					</descriptors>
-				</configuration>
 				<executions>
 					<execution>
-						<id>servicearchive</id>
-						<phase>install</phase>
 						<goals>
-							<goal>single</goal>
+							<goal>test-jar</goal>
 						</goals>
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12</version>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -300,6 +265,49 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2</version>
+				<configuration>
+					<descriptors>
+						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
+					</descriptors>
+					<archive>
+						<manifest>
+							<mainClass>fully.qualified.MainClass</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<id>servicearchive</id>
+						<phase>install</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- GWT Maven Plugin - not needed -->
+			<!-- GWT Maven Plugin -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>gwt-maven-plugin</artifactId>
+				<version>${gwtVersion}</version>
+				<executions>
+					<execution>
+						<goals>
+							<!-- <goal>compile</goal> -->
+							<!-- <goal>test</goal> -->
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
+
 </project>
diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/WorkspaceUploader.gwt.xml b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/WorkspaceUploader.gwt.xml
index 02ae691..a5df1e5 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/WorkspaceUploader.gwt.xml
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/WorkspaceUploader.gwt.xml
@@ -17,8 +17,7 @@
 
 	<stylesheet src='workspaceuploader.css' />
 	<!-- Specify the app entry point class. -->
-	<entry-point
-		class='org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploader' />
+<!-- 	<entry-point class='org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploader' /> -->
 
 	<!-- Specify the paths for translatable code -->
 	<source path='client' />
diff --git a/src/main/resources/org/gcube/portlets/widgets/workspaceuploader/WorkspaceUploader.gwt.xml b/src/main/resources/org/gcube/portlets/widgets/workspaceuploader/WorkspaceUploader.gwt.xml
index 02ae691..a5df1e5 100644
--- a/src/main/resources/org/gcube/portlets/widgets/workspaceuploader/WorkspaceUploader.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/widgets/workspaceuploader/WorkspaceUploader.gwt.xml
@@ -17,8 +17,7 @@
 
 	<stylesheet src='workspaceuploader.css' />
 	<!-- Specify the app entry point class. -->
-	<entry-point
-		class='org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploader' />
+<!-- 	<entry-point class='org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploader' /> -->
 
 	<!-- Specify the paths for translatable code -->
 	<source path='client' />