From 48ca69e423d19e2694db79c6fd6c02e6f4cbc40d Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Fri, 1 Apr 2016 10:37:08 +0000
Subject: [PATCH] updated distro folder

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/ldap-export-servlet@126544 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/INSTALL        |  2 -
 distro/LICENSE        |  8 +---
 distro/MAINTAINERS    |  6 ---
 distro/README         | 91 +++++++++++++++++++++++++++++--------------
 distro/descriptor.xml |  5 +--
 distro/svnpath.txt    |  1 -
 6 files changed, 64 insertions(+), 49 deletions(-)
 delete mode 100644 distro/INSTALL
 delete mode 100644 distro/MAINTAINERS
 delete mode 100644 distro/svnpath.txt

diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index 65c128c..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-tomcat deploy
-
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 56b8a5f..35c99c0 100644
--- a/distro/README
+++ b/distro/README
@@ -1,36 +1,67 @@
-The gCube System -  Social Library
-------------------------------------------------------------
-
-This work is partially funded by the European Commission in the
-context of the iMarine project (www.i-marine.eu), under the 1st call of FP7 IST priority.
-
+The gCube System - ${name}
+--------------------------------------------------
+ 
+${description}
+ 
+ 
+${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
-------------------------
-1.0.0 11 Dec 2015
+--------------------------------------------------
+ 
+* Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
 
-
-Description
+ 
+ 
+Maintainers
 -----------
-LDAP Export Servlet
-
+ 
+* Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+ 
+ 
 Download information
---------------------
-Source code is available from SVN:
-https://svn.d4science.research-infrastructures.eu/gcube/trunk/portal/ldap-export-servlet
-
-Binaries can be downloaded from:
-http://www.gcube-system.org/
-
+--------------------------------------------------
+ 
+Source code is available from SVN: 
+    ${scm.url}
+ 
+Binaries can be downloaded from the gCube website: 
+   ${gcube.website}
+ 
+ 
+Installation
+--------------------------------------------------
+ 
+Installation documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/
+ 
+ 
 Documentation 
--------------
-Documentation is available on-line from the Projects Documentation Wiki:
-NONE
-
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/
+    ${gcube.wikiRoot}/
+ 
+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..1edba8b 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -14,10 +14,9 @@
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<includes>
 				<include>README</include>
-				<include>LICENSE</include>
-				<include>INSTALL</include>
-				<include>MAINTAINERS</include>
+				<include>LICENSE</include>			
 				<include>changelog.xml</include>
+				<include>profile.xml</include>
 			</includes>
 			<fileMode>755</fileMode>
 			<filtered>true</filtered>
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