diff --git a/distro/INSTALL b/distro/INSTALL deleted file mode 100644 index be8c9b0..0000000 --- a/distro/INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -Installation --------------------------------------------------- - -Installation documentation is available on-line in the gCube Wiki: - https://wiki.gcube-system.org/gcube/Statistical_Algorithms_Importer \ No newline at end of file diff --git a/distro/LICENSE b/distro/LICENSE index cc51139..2d9616a 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. \ No newline at end of file +${gcube.license} \ No newline at end of file diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS deleted file mode 100644 index 667f15a..0000000 --- a/distro/MAINTAINERS +++ /dev/null @@ -1 +0,0 @@ -Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT \ No newline at end of file diff --git a/distro/README b/distro/README index ec773da..c89bd17 100644 --- a/distro/README +++ b/distro/README @@ -1,31 +1,18 @@ -The gCube System - statistical-algorithms-importer +The gCube System - ${name} -------------------------------------------------- -statistical-algorithms-importer imports statistical algorithms +${description} -This software is part of the gCube Framework (https://www.gcube-system.org/): an -open-source software toolkit used for building and operating Hybrid Data -Infrastructures enabling the dynamic deployment of Virtual Research Environments -by favouring the realisation of reuse oriented policies. +${gcube.description} -The projects leading to this software have received funding from a series of -European Union programmes including: -* the Sixth Framework Programme for Research and Technological Development - -DILIGENT (grant no. 004260); -* the Seventh Framework Programme for research, technological development and -demonstration - D4Science (grant no. 212488), D4Science-II (grant no. -239019),ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine -(grant no. 283644); -* the H2020 research and innovation programme - BlueBRIDGE (grant no. 675680), -EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant -no. 654119), SoBigData (grant no. 654024); +${gcube.funding} Version -------------------------------------------------- -1.0.0-SNAPSHOT (${maven.build.timestamp}) +${version} (${buildDate}) Please see the file named "changelog.xml" in this directory for the release notes. @@ -33,45 +20,45 @@ Please see the file named "changelog.xml" in this directory for the release note Authors -------------------------------------------------- -* Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT +* ${author0} Maintainers ----------- -* Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT +* ${mantainer0} Download information -------------------------------------------------- Source code is available from SVN: - https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer + ${scm.url} Binaries can be downloaded from the gCube website: - https://www.gcube-system.org/ + ${gcube.website} Installation -------------------------------------------------- Installation documentation is available on-line in the gCube Wiki: - https://wiki.gcube-system.org/gcube/Statistical_Algorithms_Importer + ${wikiAdmin} Documentation -------------------------------------------------- Documentation is available on-line in the gCube Wiki: - https://wiki.gcube-system.org/gcube/Statistical_Algorithms_Importer - + ${wikiUser} + ${wikiDeveloper} Support -------------------------------------------------- Bugs and support requests can be reported in the gCube issue tracking tool: - https://support.d4science.org/projects/gcube/ + ${gcube.issueTracking} Licensing diff --git a/distro/changelog.xml b/distro/changelog.xml index 04c6d8c..f6911f3 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,5 +1,5 @@ - + First Release \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml index 72989ac..dc46ade 100644 --- a/distro/descriptor.xml +++ b/distro/descriptor.xml @@ -9,14 +9,12 @@ / - distro + ${distroDirectory} / true README LICENSE - INSTALL - MAINTAINERS changelog.xml 755 @@ -25,17 +23,8 @@ - distro/svnpath.txt - /statistical-algorithms-importer-1.0.0-SNAPSHOT + target/${build.finalName}.${project.packaging} + /${artifactId} - - distro/profile.xml - / - - - target/statistical-algorithms-importer-1.0.0-SNAPSHOT.war - /statistical-algorithms-importer-1.0.0-SNAPSHOT - - \ No newline at end of file diff --git a/distro/profile.xml b/distro/profile.xml index 0279889..13575d1 100644 --- a/distro/profile.xml +++ b/distro/profile.xml @@ -3,23 +3,23 @@ Service - statistical-algorithms-importer imports statistical algorithms + ${project.description} PortletsUser - statistical-algorithms-importer + ${project.name} 1.0.0 - statistical-algorithms-importer imports statistical algorithms - statistical-algorithms-importer - 1.0.0-SNAPSHOT + ${project.description} + ${project.name} + ${version} - org.gcube.portlets.user - statistical-algorithms-importer - 1.0.0-SNAPSHOT + ${project.groupId} + ${project.artifactId} + ${project.version} webapplication - statistical-algorithms-importer-1.0.0-SNAPSHOT.war + ${project.build.finalName}.${project.packaging} diff --git a/distro/svnpath.txt b/distro/svnpath.txt deleted file mode 100644 index 7c01b4b..0000000 --- a/distro/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer \ No newline at end of file diff --git a/pom.xml b/pom.xml index ee93a5d..1d99ae6 100644 --- a/pom.xml +++ b/pom.xml @@ -37,18 +37,21 @@ - + ${project.basedir}/distro ${project.build.directory}/${project.build.finalName} 2015-04-30 - Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT - Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT - - https://wiki.gcube-system.org/gcube/Statistical_Algorithms_Importer + Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), Istituto + di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT + Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), + Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, + Pisa IT + + https://wiki.gcube-system.org/gcube/Statistical_Algorithms_Importer https://wiki.gcube-system.org/gcube/Statistical_Algorithms_Importer - + templates distro config @@ -197,20 +200,15 @@ - + org.gcube.applicationsupportlayer aslsocial provided - - + + org.gcube.portal @@ -219,11 +217,11 @@ - + org.gcube.portlets.user gcube-widgets - + - - maven-resources-plugin - 2.6 - - - - copy-distro-resources - process-resources - - copy-resources - - - ${distroDirectory} - - - ${templatesDirectory} - - true - - - - - - - - - maven-clean-plugin - 2.5 - - - - ${distroDirectory} - - ** - - false - - - ${configDirectory} - - ** - - false - - - - - - - org.apache.maven.plugins maven-assembly-plugin 2.2 - ${templatesDirectory}/descriptor.xml + ${distroDirectory}/descriptor.xml - ${project.build.finalName} servicearchive - package + install single - + diff --git a/templates/INSTALL b/templates/INSTALL deleted file mode 100644 index 0a1cc92..0000000 --- a/templates/INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -Installation --------------------------------------------------- - -Installation documentation is available on-line in the gCube Wiki: - ${wikiAdmin} \ No newline at end of file diff --git a/templates/LICENSE b/templates/LICENSE deleted file mode 100644 index cc51139..0000000 --- a/templates/LICENSE +++ /dev/null @@ -1,6 +0,0 @@ -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. \ No newline at end of file diff --git a/templates/MAINTAINERS b/templates/MAINTAINERS deleted file mode 100644 index 0985c25..0000000 --- a/templates/MAINTAINERS +++ /dev/null @@ -1 +0,0 @@ -${mantainer0} \ No newline at end of file diff --git a/templates/README b/templates/README deleted file mode 100644 index c89bd17..0000000 --- a/templates/README +++ /dev/null @@ -1,67 +0,0 @@ -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 --------------------------------------------------- - -* ${author0} - - -Maintainers ------------ - -* ${mantainer0} - - -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: - ${wikiAdmin} - - -Documentation --------------------------------------------------- - -Documentation is available on-line in the gCube Wiki: - ${wikiUser} - ${wikiDeveloper} - - -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/templates/changelog.xml b/templates/changelog.xml deleted file mode 100644 index f6911f3..0000000 --- a/templates/changelog.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - First Release - - \ No newline at end of file diff --git a/templates/descriptor.xml b/templates/descriptor.xml deleted file mode 100644 index 8cc670c..0000000 --- a/templates/descriptor.xml +++ /dev/null @@ -1,41 +0,0 @@ - - servicearchive - - tar.gz - - / - - - ${distroDirectory} - / - true - - README - LICENSE - INSTALL - MAINTAINERS - changelog.xml - - 755 - true - - - - - ${distroDirectory}/svnpath.txt - /${artifactId}-${version} - - - ${distroDirectory}/profile.xml - / - - - target/${project.build.finalName}.${packaging} - /${artifactId}-${version} - - - - \ No newline at end of file diff --git a/templates/profile.xml b/templates/profile.xml deleted file mode 100644 index 13575d1..0000000 --- a/templates/profile.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - Service - - ${project.description} - PortletsUser - ${project.name} - 1.0.0 - - - ${project.description} - ${project.name} - ${version} - - ${project.groupId} - ${project.artifactId} - ${project.version} - - webapplication - - ${project.build.finalName}.${project.packaging} - - - - - - - diff --git a/templates/svnpath.txt b/templates/svnpath.txt deleted file mode 100644 index dcd0d22..0000000 --- a/templates/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -${scm.url} \ No newline at end of file