git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/common/common-gcore-resources/1.3@144114 82a268e6-3cf1-43bd-a215-b396298e98cf

distro/INSTALL

@@ -1 +0,0 @@
- 

distro/LICENSE

@@ -1,6 +1 @@
-gCube System - License
+${gcube.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.

distro/MAINTAINERS

@@ -1,4 +0,0 @@
-* Fabio Simeoni (fabio.simeoni@fao.org), FAO of the UN, Italy
-* Roberto Cirillo (roberto.cirillo@isti.cnr.it), CNR, Italy
-* Luigi Fortunati (luigi.fortunati@isti.cnr.it), CNR, Italy
-* Luca Frosini (luca.frosini@isti.cnr.it), CNR, Italy

distro/README

@@ -1,41 +1,59 @@
 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).
-
-Authors
--------
-
-* Fabio Simeoni (fabio.simeoni@fao.org), FAO of the UN, Italy
-* Roberto Cirillo (roberto.cirillo@isti.cnr.it), CNR, Italy
-* Luigi Fortunati (luigi.fortunati@isti.cnr.it), CNR, Italy
-* Luca Frosini (luca.frosini@isti.cnr.it), CNR, Italy
-
-Version and Release Date
-------------------------
-${version}
-
-Description
------------
 ${description}
  
+ 
+${gcube.description}
+ 
+${gcube.funding}
+ 
+ 
+Version
+--------------------------------------------------
+ 
+${version} (${buildDate})
+ 
+Please see the file named "changelog.xml" in this directory for the release notes.
+ 
+Authors
+--------------------------------------------------
+* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy
+
+Maintainers
+--------------------------------------------------
+* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy
+
 Download information
---------------------
+--------------------------------------------------
  
 Source code is available from SVN: 
-${scm.url}
+    ${scm.url}
  
-Binaries can be downloaded from:
+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:
+ 
-https://gcube.wiki.gcube-system.org/gcube/index.php/Common-gcore-resources
+Documentation is available on-line in the gCube Wiki:
+    ${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.

distro/changelog.xml

@@ -22,4 +22,7 @@
 	<Changeset component="common-gcore-resources-1.3.1" date="2015-06-30">
 		<Change>Added lock on resource unmashalling</Change>
 	</Changeset>
+	<Changeset component="common-gcore-resources-1.3.3" date="2017-02-22">
+		<Change>Distro layout updated</Change>
+	</Changeset>
 </ReleaseNotes>

distro/descriptor.xml

@@ -15,24 +15,21 @@
 			<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>
 		</fileSet>
 	</fileSets>
 	<files>
+		<file>
+			<source>${distroDirectory}/profile.xml</source>
+			<outputDirectory>/</outputDirectory>
+			<filtered>true</filtered>
+		</file>
 		<file>
 			<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>

distro/svnpath.txt

@@ -1 +0,0 @@
-${scm.url} 

pom.xml

@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>org.gcube.resources</groupId>
 	<artifactId>common-gcore-resources</artifactId>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>1.3.3-SNAPSHOT</version>
 
 	<scm>
 		<connection>scm:svn:http://svn.d4science.research-infrastructures.eu/gcube/trunk/Common/${project.artifactId}</connection>