diff --git a/.classpath b/.classpath
index 6557bc4..786bc88 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -45,5 +45,5 @@
-
+
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 @@
+
+ Updated to Liferay 6.2
+
Fixed back button behavior [issue #3249]
diff --git a/pom.xml b/pom.xml
index 42d3f32..22db189 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
4.0.0
org.gcube.portlets.user
tabular-data-manager
- 2.10.0-SNAPSHOT
+ 2.11.0-SNAPSHOT
war
@@ -60,11 +60,56 @@
localRun
+
+
+ org.gcube.common
+ common-authorization
+ runtime
+
+
+
+ org.gcube.common
+ authorization-client
+ runtime
+
+
+
+
+
+ org.gcube.contentmanagement
+ storage-manager-core
+ runtime
+
+
+ org.gcube.contentmanagement
+ storage-manager-wrapper
+ runtime
+
+
+
+
+ org.gcube.common
+ home-library
+ runtime
+
+
+ org.gcube.common
+ home-library-jcr
+ runtime
+
+
+ org.gcube.common
+ home-library-model
+ runtime
+
+
xerces
xercesImpl
2.11.0
+
+
org.slf4j
slf4j-api
@@ -76,37 +121,8 @@
1.0.1
runtime
-
-
-
- org.gcube.contentmanagement
- storage-manager-core
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
-
-
- org.gcube.contentmanagement
- storage-manager-wrapper
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
-
-
- org.gcube.common
- home-library
-
-
- org.gcube.common
- home-library-jcr
-
-
+
+
@@ -147,7 +163,6 @@
-
javax.portlet
@@ -161,6 +176,7 @@
org.gcube.core
common-scope-maps
+
compile
@@ -175,12 +191,13 @@
- org.gcube.applicationsupportlayer
- accesslogger
+ org.gcube.dvos
+ usermanagement-core
+ provided
-
org.gcube.common
common-authorization
@@ -191,7 +208,15 @@
org.gcube.common
authorization-client
provided
- -->
+
+
+
+
+ org.gcube.portlets.user
+ gcube-widgets
+ compile
+
+
@@ -206,21 +231,20 @@
provided
-
+
- org.gcube.portlets.user
- gcube-widgets
- compile
+ org.gcube.contentmanagement
+ storage-manager-core
+ provided
-
-
- org.gcube.portlets.widgets
- workspace-explorer
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ org.gcube.contentmanagement
+ storage-manager-wrapper
+ provided
-
+
+
org.gcube.common
home-library
@@ -233,6 +257,20 @@
provided
+
+ org.gcube.common
+ home-library-model
+ provided
+
+
+
+
+
+ org.gcube.portlets.widgets
+ session-checker
+ [0.2.0-SNAPSHOT,1.0.0-SNAPSHOT)
+
+
@@ -241,8 +279,6 @@
[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
-
-
commons-io
@@ -266,14 +302,14 @@
[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)
-
+
+
org.gcube.portlets.widgets
- session-checker
- [0.2.0-SNAPSHOT,1.0.0-SNAPSHOT)
+ workspace-explorer
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
-
org.gcube.portlets.user
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 @@
+
+
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 @@
-
-
-
+
+
TabularDataManager
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 @@
-
+
- TabularDataManager
+ TabularDataManager
TabularDataManager
TabularDataManager
org.gcube.portlets.user.td.server.portlet.TabularDataPortlet
@@ -14,5 +17,11 @@
TabularDataManager
TabularDataManager
+
+
+ portlet-setup-show-borders
+ false
+
+
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 @@
-
-
-
+
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;
+}