diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index a8ee1f1..a8fcf7a 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,16 +5,10 @@
-
+
uses
-
- uses
-
-
- uses
-
-
+
uses
diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index 227d84f..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Manual build
-You need this projects:
--Home Library
--Home Library JCR
--workspace-tree-widget
--workspace
\ No newline at end of file
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index d43c386..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,4 +0,0 @@
-Mantainers
--------
-
-* Francesco Mangiacrapa (francesco.mangiacrapa@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
diff --git a/distro/README b/distro/README
index d71a322..f2ce602 100644
--- a/distro/README
+++ b/distro/README
@@ -1,46 +1,60 @@
-The gCube System - WorkspacePortlet
-------------------------------------------------------------
-
-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)
-
-
-Authors
--------
-
-* Francesco Mangiacrapa (francesco.mangiacrapa@isti.cnr.it), CNR Pisa,
- Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
-
-
-Version and Release Date
-------------------------
-
-v. 6.11.0 January 2016
+The gCube System - ${name}
+--------------------------------------------------
-
-Description
+${description}
+
+
+${gcube.description}
+
+${gcube.funding}
+
+
+Version
+--------------------------------------------------
+
+${version} (${buildDate})
+
+Please see the file named "changelog.xml" in this directory for the release notes.
+
+
+Authors
+--------------------------------------------------
+
+* Francesco Mangiacrapa (francesco.mangiacrapa-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+
+Maintainers
-----------
-
-The Workspace Portlet is a portlet for users workspace management.
-
+
+* Francesco Mangiacrapa (francesco.mangiacrapa-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+
Download information
---------------------
-
-Source code is available from SVN:
-http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/workspace
-
-Binaries can be downloaded from:
-n/a
-
+--------------------------------------------------
+
+Source code is available from SVN:
+ ${scm.url}
+
+Binaries can be downloaded from the gCube website:
+ ${gcube.website}
+
+
+Installation
+--------------------------------------------------
+
Documentation
--------------
-Documentation is available on-line from the Projects Documentation Wiki:
-https://gcube.wiki.gcube-system.org/gcube/index.php/Workspace
-
-
+--------------------------------------------------
+
+Documentation is available on-line in the gCube Wiki:
+ ${gcube.wikiRoot}/gcube/Workspace
+
+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.
\ No newline at end of file
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 7030c4d..a686800 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,9 @@
6.11.0-SNAPSHOT
gCube Workspace Portlet
- gcube Workspace Portlet is a portlet for users workspace management
+ gCube Workspace Portlet is a web-gui to manage the gCube workspace a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs.
+ Every user of any Virtual Research Environment is provided with this area for the exchange of workspace objects (share) with other users.
+ Such an area is further organized in workspaces as to resemble a classic folder-based file system.
scm:svn:http://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/${project.artifactId}
@@ -162,6 +164,12 @@
home-library-jcr
[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
provided
+
+
+ asm-debug-all
+ org.ow2.asm
+
+
org.gcube.common