From 9a7917a1e2161a8043db4e9d0104fe2c20b74d2a Mon Sep 17 00:00:00 2001
From: "mariaantonietta.digirolamo" <mariaantonietta.digirolamo@mycompany.com>
Date: Tue, 22 Mar 2016 11:48:32 +0000
Subject: [PATCH] updated distro directory and removed deprecated files

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/common/common-gcore-stubs/1.0@126032 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/INSTALL        |  1 -
 distro/LICENSE        |  7 +---
 distro/MAINTAINERS    |  1 -
 distro/README         | 92 +++++++++++++++++++++++++++----------------
 distro/descriptor.xml | 11 +-----
 distro/svnpath.txt    |  1 -
 6 files changed, 61 insertions(+), 52 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 8d1c8b6..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/distro/LICENSE b/distro/LICENSE
index 630ba97..3695e26 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,6 +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}
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index 5e8aa8f..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-* Fabio Simeoni (fabio.simeoni@fao.org), FAO of the UN, Italy
\ No newline at end of file
diff --git a/distro/README b/distro/README
index 07c1f6a..1e8cb37 100644
--- a/distro/README
+++ b/distro/README
@@ -1,40 +1,64 @@
-The gCube System - ${name} 
-----------------------
-
-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
--------
-
-* Fabio Simeoni (fabio.simeoni@fao.org), FAO of the UN, Italy
-* Lucio Lelii (lucio.lelii@isti.cnr.it), FAO of the UN, Italy
-
-Version and Release Date
-------------------------
-${version}
-
-Description
------------
+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
+--------------------------------------------------
 
+* Fabio Simeoni (fabio.simeoni-AT-fao.org), FAO of the UN, Italy
+* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), FAO of the UN, Italy
+
+Maintainers
+-----------
+
+* Fabio Simeoni (fabio.simeoni-AT-fao.org), FAO of the UN, Italy
+* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), FAO of the UN, Italy
+ 
 Download information
---------------------
-
-Source code is available from SVN:
-${scm.url}
-
-Binaries can be downloaded from:
-
-
+--------------------------------------------------
+ 
+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}/[admin guide page name here]  
+ 
 Documentation 
--------------
-Documentation is available on-line from the Projects Documentation Wiki:
-https://gcube.wiki.gcube-system.org/gcube/index.php
-
-
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/[user guide page name here]    ${gcube.wikiRoot}/[developer guide page name here] 
+ 
+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.
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index 06c416f..dd16f0c 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,10 +15,8 @@
 			<includes>
 				<include>README</include>
 				<include>LICENSE</include>
-				<include>INSTALL</include>
-				<include>MAINTAINERS</include>
 				<include>changelog.xml</include>
-				<include>profile.xml</include>
+                                <include>profile.xml</include>
 			</includes>
 			<fileMode>755</fileMode>
 			<filtered>true</filtered>
@@ -29,10 +27,5 @@
 			<source>target/${build.finalName}.jar</source>
 			<outputDirectory>/${artifactId}</outputDirectory>
 		</file>
-		<file>
-			<source>${distroDirectory}/svnpath.txt</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-			<filtered>true</filtered>
-		</file>
 	</files>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index f416f9d..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-${scm.url}