From 27c5faa0ace3ed5394af2eb58e0dd0c4db401576 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Thu, 23 Jun 2016 14:03:44 +0000
Subject: [PATCH] refs:4382:
 org.gcube.portlets-user.tabular-data-portlet.2-11-0
 https://support.d4science.org/issues/4382

Updated to Liferay 6.2 fix css

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@129361 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                  |   6 +-
 distro/changelog.xml                        |   4 +
 pom.xml                                     | 142 ++++++++++++--------
 src/main/webapp/WEB-INF/liferay-display.xml |   3 +
 src/main/webapp/WEB-INF/liferay-portlet.xml |   6 +-
 src/main/webapp/WEB-INF/portlet.xml         |  13 +-
 src/main/webapp/WEB-INF/web.xml             |   9 +-
 src/main/webapp/tabulardataportlet.css      |  30 ++++-
 8 files changed, 142 insertions(+), 71 deletions(-)

diff --git a/.classpath b/.classpath
index 6557bc4..786bc88 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-manager-2.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-manager-2.11.0-SNAPSHOT/WEB-INF/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/tabular-data-manager-2.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-manager-2.11.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -45,5 +45,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/tabular-data-manager-2.10.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-manager-2.11.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 1849220..20b7d58 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-11-0"
+		date="2016-07-15">
+		<Change>Updated to Liferay 6.2</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-10-0"
 		date="2016-05-01">
 		<Change>Fixed back button behavior [issue #3249]</Change>
diff --git a/pom.xml b/pom.xml
index 42d3f32..22db189 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>tabular-data-manager</artifactId>
-	<version>2.10.0-SNAPSHOT</version>
+	<version>2.11.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 
@@ -60,11 +60,56 @@
 		<profile>
 			<id>localRun</id>
 			<dependencies>
+				<!-- Authorization -->
+				<dependency>
+					<groupId>org.gcube.common</groupId>
+					<artifactId>common-authorization</artifactId>
+					<scope>runtime</scope>
+				</dependency>
+
+				<dependency>
+					<groupId>org.gcube.common</groupId>
+					<artifactId>authorization-client</artifactId>
+					<scope>runtime</scope>
+				</dependency>
+			
+
+				<!-- Storage -->
+				<dependency>
+					<groupId>org.gcube.contentmanagement</groupId>
+					<artifactId>storage-manager-core</artifactId>
+					<scope>runtime</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.gcube.contentmanagement</groupId>
+					<artifactId>storage-manager-wrapper</artifactId>
+					<scope>runtime</scope>
+				</dependency>
+
+				<!-- Home Library -->
+				<dependency>
+					<groupId>org.gcube.common</groupId>
+					<artifactId>home-library</artifactId>
+					<scope>runtime</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.gcube.common</groupId>
+					<artifactId>home-library-jcr</artifactId>
+					<scope>runtime</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.gcube.common</groupId>
+					<artifactId>home-library-model</artifactId>
+					<scope>runtime</scope>
+				</dependency>
+				
 				<dependency>
 					<groupId>xerces</groupId>
 					<artifactId>xercesImpl</artifactId>
 					<version>2.11.0</version>
 				</dependency>
+				
+				<!-- Log -->
 				<dependency>
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-api</artifactId>
@@ -76,37 +121,8 @@
 					<version>1.0.1</version>
 					<scope>runtime</scope>
 				</dependency>
-				<!-- 
-				<dependency>
-					<groupId>org.gcube.common</groupId>
-					<artifactId>common-authorization</artifactId>
-					<scope>runtime</scope>
-				</dependency>
-				<dependency>
-					<groupId>org.gcube.common</groupId>
-					<artifactId>authorization-client</artifactId>
-					<scope>runtime</scope>
-				</dependency>  -->
-				<!-- Storage for CSV temp -->
-				<dependency>
-					<groupId>org.gcube.contentmanagement</groupId>
-					<artifactId>storage-manager-core</artifactId>
-					<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-				</dependency>
-				<dependency>
-					<groupId>org.gcube.contentmanagement</groupId>
-					<artifactId>storage-manager-wrapper</artifactId>
-					<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-				</dependency>
-				<dependency>
-					<groupId>org.gcube.common</groupId>
-					<artifactId>home-library</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>org.gcube.common</groupId>
-					<artifactId>home-library-jcr</artifactId>
-				</dependency>
-			</dependencies>
+				
+				</dependencies>
 		</profile>
 	</profiles>
 
@@ -147,7 +163,6 @@
 		</dependency>
 
 
-
 		<!-- Portlet -->
 		<dependency>
 			<groupId>javax.portlet</groupId>
@@ -161,6 +176,7 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
+			<!-- <version>[1.0.2-SNAPSHOT,2.0.0-SNAPSHOT)</version> -->
 			<scope>compile</scope>
 		</dependency>
 
@@ -175,12 +191,13 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.gcube.applicationsupportlayer</groupId>
-			<artifactId>accesslogger</artifactId>
+			<groupId>org.gcube.dvos</groupId>
+			<artifactId>usermanagement-core</artifactId>
+			<scope>provided</scope>
 		</dependency>
 
 
-		<!-- Authorization 
+		<!-- Authorization -->
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>common-authorization</artifactId>
@@ -191,7 +208,15 @@
 			<groupId>org.gcube.common</groupId>
 			<artifactId>authorization-client</artifactId>
 			<scope>provided</scope>
-		</dependency> -->
+		</dependency>
+
+		<!-- GCube Widgets -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>gcube-widgets</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		
 
 		<!-- Social -->
 		<dependency>
@@ -206,21 +231,20 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- GCube Widgets -->
+		<!-- Storage -->
 		<dependency>
-			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>gcube-widgets</artifactId>
-			<scope>compile</scope>
+			<groupId>org.gcube.contentmanagement</groupId>
+			<artifactId>storage-manager-core</artifactId>
+			<scope>provided</scope>
 		</dependency>
 
-
-		<!-- WSLT dependencies -->
 		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>workspace-explorer</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<groupId>org.gcube.contentmanagement</groupId>
+			<artifactId>storage-manager-wrapper</artifactId>
+			<scope>provided</scope>
 		</dependency>
-		
+
+		<!-- Home Library -->
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>home-library</artifactId>
@@ -233,6 +257,20 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>home-library-model</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+
+		<!-- Session Checker -->
+		<dependency>
+			<groupId>org.gcube.portlets.widgets</groupId>
+			<artifactId>session-checker</artifactId>
+			<version>[0.2.0-SNAPSHOT,1.0.0-SNAPSHOT)</version>
+		</dependency>
+
 
 		<!-- service-client-impl -->
 		<dependency>
@@ -241,8 +279,6 @@
 			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
 
-
-
 		<!-- Apache Common Library -->
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -266,14 +302,14 @@
 			<version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 
-		<!-- Session Checker -->
+	
+		<!-- WSLT dependencies -->
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>session-checker</artifactId>
-			<version>[0.2.0-SNAPSHOT,1.0.0-SNAPSHOT)</version>
+			<artifactId>workspace-explorer</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 
-
 		<!-- tabular-data-widget-common-event -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index cc66c0e..4bda77b 100644
--- a/src/main/webapp/WEB-INF/liferay-display.xml
+++ b/src/main/webapp/WEB-INF/liferay-display.xml
@@ -1,3 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 6.2.0//EN" 
+  "http://www.liferay.com/dtd/liferay-display_6_2_0.dtd">
 <display>
 	<category name="gCube Applications">
 		<portlet id="TabularDataManager" />
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index d338857..848dd3a 100644
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 5.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_5_2_0.dtd">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" 
+  "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
 <liferay-portlet-app>
 	<portlet>
 		<portlet-name>TabularDataManager</portlet-name>
diff --git a/src/main/webapp/WEB-INF/portlet.xml b/src/main/webapp/WEB-INF/portlet.xml
index a5917ca..0ecd34b 100644
--- a/src/main/webapp/WEB-INF/portlet.xml
+++ b/src/main/webapp/WEB-INF/portlet.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<portlet-app xmlns='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' version='2.0'>
+<portlet-app xmlns='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd'
+	xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd'
+	version='2.0'>
 	<portlet>
-        <description>TabularDataManager</description>
+		<description>TabularDataManager</description>
 		<portlet-name>TabularDataManager</portlet-name>
 		<display-name>TabularDataManager</display-name>
 		<portlet-class>org.gcube.portlets.user.td.server.portlet.TabularDataPortlet</portlet-class>
@@ -14,5 +17,11 @@
 			<title>TabularDataManager</title>
 			<short-title>TabularDataManager</short-title>
 		</portlet-info>
+		<portlet-preferences>
+			<preference>
+				<name>portlet-setup-show-borders</name>
+				<value>false</value>
+			</preference>
+		</portlet-preferences>
 	</portlet>
 </portlet-app>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 800dda4..ec6ef89 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+          http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
 
 	<!-- Servlets -->
 	<!-- JUnit -->
diff --git a/src/main/webapp/tabulardataportlet.css b/src/main/webapp/tabulardataportlet.css
index 22e9a0f..4078a2c 100644
--- a/src/main/webapp/tabulardataportlet.css
+++ b/src/main/webapp/tabulardataportlet.css
@@ -1,7 +1,27 @@
-/** Add css rules here for your application. */
-/*table {
-	border-spacing: 1px !important;
-	top: 0px !important;
-}*/
+/* FIX FOR Portal Theme */
+.aui input[type="text"], .aui select, .aui textarea, .aui .uneditable-input {
+	margin-bottom: 1px !important;
+	padding: 0px !important;
+}
+
+.aui p {
+    margin: 0px !important;
+}
+
+.aui img {
+    vertical-align: baseline !important; 
+}
+
+.aui fieldset {
+    padding: 9px !important;
+    /* margin: 0; */
+    border: 1px solid rgb(181, 184, 200) !important;
+}
+
+.aui legend {
+	margin-bottom: 0px !important;
+	width: auto !important; 
+	border-bottom: none !important;
+}