Fixed enhancements:

Ticket #2512 Workspace: integration of Progress Bar Widget for File Uploads

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@90306 82a268e6-3cf1-43bd-a215-b396298e98cf

pom.xml

@@ -164,14 +164,14 @@
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>workspace-tree-widget</artifactId>
 			<version>[6.0.0-SNAPSHOT, 7.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
+<!-- 			<scope>provided</scope> -->
 		</dependency>
 
 		<!-- WSLT dependencies -->
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>workspace-light-tree</artifactId>
-			<scope>provided</scope>
+<!-- 			<scope>provided</scope> -->
 		</dependency>
 
 		<dependency>

src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml

@@ -20,6 +20,7 @@
 
 	<inherits name='org.gcube.portlets.widgets.wsmail.WsMail_Widget' />
 
+  <inherits name='org.gcube.portlets.widgets.fileupload.FileUpload' />
 
 	<!-- Specify the app entry point class. -->
 	<entry-point

src/main/webapp/WEB-INF/web.xml

@@ -11,6 +11,31 @@
 	</welcome-file-list>
 
 
+
+	<!-- FILE UPLOAD WIDGET -->
+	<servlet>
+		<servlet-name>uploadprogress</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadProgressServlet</servlet-class>
+	</servlet>
+ 
+	<servlet-mapping>
+		<servlet-name>uploadprogress</servlet-name>
+		<url-pattern>/workspace/uploadprogress</url-pattern>
+	</servlet-mapping>
+ 
+	<!-- DO NOT CHANGE - DO NOT Replace URL PATTERN HERE -->
+	<servlet>
+		<servlet-name>upload</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadServlet</servlet-class>
+	</servlet>
+ 
+	<servlet-mapping>
+		<servlet-name>upload</servlet-name>
+		<url-pattern>/FileUpload/upload</url-pattern>
+	</servlet-mapping>
+ 
+	<!-- END DO NOT CHANGE -->
+	
 	<servlet>
 		<servlet-name>UploadService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class>
@@ -20,6 +45,22 @@
 		<servlet-name>UploadService</servlet-name>
 		<url-pattern>/workspace/UploadService</url-pattern>
 	</servlet-mapping>
+	
+	
+
+	
+	<servlet>
+		<servlet-name>LocalUploadService</servlet-name>
+		<servlet-class>org.gcube.portlets.user.workspace.server.LocalUploadServlet</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>LocalUploadService</servlet-name>
+		<url-pattern>/workspace/LocalUploadService</url-pattern>
+	</servlet-mapping>
+	
+	
+	
 
 	<servlet>
 		<servlet-name>DownloadService</servlet-name>

src/main/webapp/workspaceportlet.css

@@ -1,5 +1,6 @@
 @import url(http://fonts.googleapis.com/css?family=Architects+Daughter);
 @import url(newtheme.css);
+@import url(workspace/old-dialog.css);
 
 #SearchAndFilter {
 	background-color: #d0def0;