diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index 139597f..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/distro/LICENSE b/distro/LICENSE
index cdb5851..2d9616a 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,7 +1 @@
-gCube System - License
-------------------------------------------------------------
-
-The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl).
-The software and documentation is provided by its authors/distributors "as is" and no expressed or
-implied warranty is given for its use, quality or fitness for a particular case.
-
+${gcube.license}
\ No newline at end of file
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index 680cebb..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-Mantainers
--------
-
-* Massimiliano Assante (massimiliano.assante@isti.cnr.it), CNR Pisa,
- Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
-
diff --git a/distro/README b/distro/README
index 8989b70..70cc12c 100644
--- a/distro/README
+++ b/distro/README
@@ -1,35 +1,45 @@
-The gCube System - VRE Members Portlet
+The gCube System
------------------------------------------------------------
-This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2),
-D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2),
-and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1).
+${gcube.description}
+
+${gcube.funding}
+
+
+Version
+--------------------------------------------------
+${version} (${buildDate})
+
+Please see the file named "changelog.xml" in this directory for the release notes.
+
Authors
-------
-Massimiliano Assante
-*
-Version and Release Date
-------------------------
+
+
+Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
-Description
+Maintainers
-----------
-
-
-Download information
---------------------
-Source code is available from SVN:
-
-
-Binaries can be downloaded from:
-
-
-Documentation
+
+Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+
+
+Documentation
-------------
-Documentation is available on-line from the Projects Documentation Wiki:
+Documentation is available on - line from the Projects Documentation wiki:
+
+ {gcube.wikiRoot}/gcube/index.php/UserManagement_Core
+
+
+Support
+--------------------------------------------------
+Bugs and support requests can be reported in the gCube issue tracking tool:
+ ${gcube.issueTracking}
+
+
Licensing
----------
-
-This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
+--------------------------------------------------
+This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index 4efc827..ced14c7 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,8 +15,7 @@
README
LICENSE
- INSTALL
- MAINTAINERS
+ profile.xml
changelog.xml
755
@@ -39,10 +38,5 @@
target/${build.finalName}.war
/${artifactId}
-
- ${distroDirectory}/svnpath.txt
- /${artifactId}
- true
-
\ No newline at end of file
diff --git a/distro/profile.xml b/distro/profile.xml
index ee9da4e..51c3b6b 100644
--- a/distro/profile.xml
+++ b/distro/profile.xml
@@ -3,7 +3,7 @@
Service
- gCube VRE Members Portlet
+ ${description}
PortletUser
${artifactId}
${version}
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index edacb04..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-${scm.url}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7a47128..ee52ced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,7 @@
-
+
4.0.0
maven-parent
@@ -46,6 +47,12 @@
+
+ org.gcube.common.portal
+ portal-manager
+ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
+ provided
+
com.liferay.portal
portal-service
@@ -77,17 +84,17 @@
provided
-
-
- Liferay-v6.2-CE-(Tomcat-7)-(2)
-
- 6.2.5
- 6.2.5
- /Users/massi/portal/liferay-portal-6.2-ce-ga6/deploy
- /Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps
- /Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext
- /Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps/ROOT
-
-
-
+
+
+ Liferay-v6.2-CE-(Tomcat-7)-(2)
+
+ 6.2.5
+ 6.2.5
+ /Users/massi/portal/liferay-portal-6.2-ce-ga6/deploy
+ /Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps
+ /Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext
+ /Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps/ROOT
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf b/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf
index 28490d9..c2a914d 100644
--- a/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf
+++ b/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf
@@ -1,10 +1,12 @@
+<%@ page import="org.gcube.common.portal.GCubePortalConstants" %>
+
<%
//themeDisplay.getUser().getScreenName();
String currentVirtualHost = request.getServerName();
String groupName = currentVirtualHost.split("\\.")[0];
-
- String mySiteURL = "/" + groupName;
+
+ String mySiteURL = GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName;
%>