From 5fbe3ab289f1a4758e8e90a7c33b87f6d4178670 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 14 May 2020 17:07:45 +0200
Subject: [PATCH] bug #19243 added 'application/x-zip-compressed' in the
 allowed list of mime types

---
 changelog.xml                                 | 48 +++++++++++++------
 pom.xml                                       |  2 +-
 .../server/WorkspaceUploadServletStream.java  |  1 +
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/changelog.xml b/changelog.xml
index 864d101..79fa6ba 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -1,9 +1,17 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.2-0-4"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.2-0-5"
+		date="2020-05-14">
+		<Change>[Bug #19243] upload archive facility does not work properly
+			with Windows OS</Change>
+	</Changeset>
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.2-0-4"
 		date="2019-12-19">
 		<Change>Updated to Git and Jenkins</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.2-0-3"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.2-0-3"
 		date="2019-09-15">
 		<Change>[Task #17152] Workspace uploader: avoid . (dot) char added as
 			suffix when the filename does not contain an extension
@@ -17,19 +25,22 @@
 			versions) is never generated
 		</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.2-0-2"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.2-0-2"
 		date="2019-04-01">
 		<Change>[Incident #16285] Bug fixing
 		</Change>
 		<Change>[Feature #13327] Checking permission before uploading
 		</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.2-0-1"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.2-0-1"
 		date="2019-01-30">
 		<Change>[Bug #13232] Fixing it
 		</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.2-0-0"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.2-0-0"
 		date="2018-09-19">
 		<Change>[Feature #11722] Workspace Uploader - Update to StorageHUB
 		</Change>
@@ -40,7 +51,8 @@
 			drag and drop facility on Windows Operating System
 		</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-8-0"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.1-8-0"
 		date="2017-03-27">
 		<Change>[Task #7820] DaD and Browse: create new version of existing
 			items added
@@ -50,40 +62,48 @@
 			completed
 		</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-7-0"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.1-7-0"
 		date="2017-02-23">
 		<Change>Removed currUserId parameter from client-side</Change>
 		<Change>[Feature #6153] Improve error messages</Change>
 		<Change>Integrated with file versioning</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-6-0"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.1-6-0"
 		date="2016-12-01">
 		<Change>Feature #5901 Remove ASL Dependency from workspace-uploader
 			Widget
 		</Change>
 		<Change>Bug #6096 Fixed</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-4-0"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.1-4-0"
 		date="2016-05-31">
 		<Change>[Feature #4128] Migration to Liferay 6.2</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-3-0"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.1-3-0"
 		date="2016-05-18">
 		<Change>[Feature #4055] DnD multiple instances</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-2-0"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.1-2-0"
 		date="2016-05-09">
 		<Change>[Feature #3962] Sequential upload status</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-1-0"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.1-1-0"
 		date="2016-01-08">
 		<Change>Bug Fixed #1333</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-0-1"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.1-0-1"
 		date="2015-12-16">
 		<Change>Bug Fixed - https://support.d4science.org/issues/1824</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-0-0"
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.1-0-0"
 		date="2015-08-07">
 		<Change>first release</Change>
 	</Changeset>
diff --git a/pom.xml b/pom.xml
index 7967c9f..ece871f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>workspace-uploader</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.4-SNAPSHOT</version>
+	<version>2.0.5-SNAPSHOT</version>
 	<name>Workspace Uploader Widget</name>
 	<description>Workspace Uploader Widget allows your application to upload file/s in the gCube Workspace</description>
 	<scm>
diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
index 421f7fb..f581790 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
@@ -113,6 +113,7 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 	    put("java archive","application/java-archive");//.jar
 	    put("jar","application/x-java-archive");
 	    put("gtar","application/x-gtar");
+	    put("x-zip","application/x-zip-compressed");
 	}};
 
 	public static Logger logger = LoggerFactory.getLogger(WorkspaceUploadServletStream.class);