From f9d8d89bc724c425d0d2a8f9593671100073d466 Mon Sep 17 00:00:00 2001
From: "mariaantonietta.digirolamo" <mariaantonietta.digirolamo@mycompany.com>
Date: Fri, 18 Mar 2016 14:45:40 +0000
Subject: [PATCH] README modified

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/common/common-fw-clients/1.0@125753 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/INSTALL        |  1 -
 distro/LICENSE        |  7 +----
 distro/MAINTAINERS    |  2 --
 distro/README         | 72 ++++++++++++++++++++++++++++++-------------
 distro/descriptor.xml | 10 ++----
 distro/svnpath.txt    |  1 -
 6 files changed, 53 insertions(+), 40 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 3d20d89..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-* Fabio Simeoni (fabio.simeoni@fao.org), FAO of the UN, Italy
-* Rena Tsantouli (e.tsantoylh@di.uoa.gr), University of Athens, Greece
\ No newline at end of file
diff --git a/distro/README b/distro/README
index ec74aa9..c45d5e6 100644
--- a/distro/README
+++ b/distro/README
@@ -1,29 +1,47 @@
-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).
-
+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@fao.org), FAO of the UN, Italy.
+* Fabio Simeoni (fabio.simeoni-AT-fao.org), FAO of the UN, Italy.
 
-Version and Release Date
-------------------------
-${version}
+Maintainers
+--------------------------------------------------
 
-Description
------------
-${description}
-
-Download information
---------------------
+* Fabio Simeoni (fabio.simeoni-AT-fao.org), FAO of the UN, Italy.
 
-Source code is available from SVN:
-${scm.url}
 
-Binaries can be downloaded from:
+Download information
+--------------------------------------------------
+ 
+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:
 
 
 Documentation 
@@ -32,7 +50,17 @@ Documentation is available on-line from the Projects Documentation Wiki:
 https://https://gcube.wiki.gcube-system.org/gcube/index.php/Integration_and_Interoperability_Facilities_Framework:_Client_Libraries_Framework
 
 
+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 21d8c88..0320287 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,9 +15,8 @@
 			<includes>
 				<include>README</include>
 				<include>LICENSE</include>
-				<include>INSTALL</include>
-				<include>MAINTAINERS</include>
 				<include>changelog.xml</include>
+                                <include>profile.xml</include>
 			</includes>
 			<fileMode>755</fileMode>
 			<filtered>true</filtered>
@@ -33,10 +32,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}