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 eeb18f6..0000000 --- a/distro/MAINTAINERS +++ /dev/null @@ -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 \ No newline at end of file diff --git a/distro/README b/distro/README index 65ef90f..76864cf 100644 --- a/distro/README +++ b/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). - +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 -* 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 +-------------------------------------------------- +* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy -Version and Release Date ------------------------- -${version} - -Description ------------ -${description} +Maintainers +-------------------------------------------------- +* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, 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} + 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. diff --git a/distro/changelog.xml b/distro/changelog.xml index 62e8a6d..8f6037f 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -22,4 +22,7 @@ Added lock on resource unmashalling + + Distro layout updated + \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml index 06c416f..ae939d3 100644 --- a/distro/descriptor.xml +++ b/distro/descriptor.xml @@ -15,10 +15,7 @@ README LICENSE - INSTALL - MAINTAINERS changelog.xml - profile.xml 755 true @@ -26,13 +23,13 @@ - target/${build.finalName}.jar - /${artifactId} + ${distroDirectory}/profile.xml + / + true - ${distroDirectory}/svnpath.txt + target/${build.finalName}.jar /${artifactId} - true - \ No newline at end of file + 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} diff --git a/pom.xml b/pom.xml index 4e85b5e..0e8c85c 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.gcube.resources common-gcore-resources - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT scm:svn:http://svn.d4science.research-infrastructures.eu/gcube/trunk/Common/${project.artifactId}