From fad47a3b1ede84b23d9ad7b708b93f23d8f90b4d Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 21 Mar 2016 13:23:23 +0000 Subject: [PATCH] Fixed distro git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-replacebyexternal-widget@125852 82a268e6-3cf1-43bd-a215-b396298e98cf --- config/profile.xml | 29 --------- distro/INSTALL | 0 distro/LICENSE | 7 +- distro/MAINTAINERS | 1 - distro/README | 96 +++++++++++++++++----------- {templates => distro}/descriptor.xml | 15 ++--- {templates => distro}/profile.xml | 2 +- distro/svnpath.txt | 1 - pom.xml | 96 ++++------------------------ templates/INSTALL | 0 templates/LICENSE | 6 -- templates/MAINTAINERS | 1 - templates/README | 48 -------------- templates/changelog.xml | 11 ---- templates/svnpath.txt | 1 - 15 files changed, 75 insertions(+), 239 deletions(-) delete mode 100644 config/profile.xml delete mode 100644 distro/INSTALL delete mode 100644 distro/MAINTAINERS rename {templates => distro}/descriptor.xml (68%) rename {templates => distro}/profile.xml (97%) delete mode 100644 distro/svnpath.txt delete mode 100644 templates/INSTALL delete mode 100644 templates/LICENSE delete mode 100644 templates/MAINTAINERS delete mode 100644 templates/README delete mode 100644 templates/changelog.xml delete mode 100644 templates/svnpath.txt diff --git a/config/profile.xml b/config/profile.xml deleted file mode 100644 index 101647e..0000000 --- a/config/profile.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - Service - - tabular-data-replacebyexternal-widget allows the replace of column by external tabular resource - PortletsUser - tabular-data-replacebyexternal-widget - 1.2.0-SNAPSHOT - - - tabular-data-replacebyexternal-widget allows the replace of column by external tabular resource - tabular-data-replacebyexternal-widget - 1.2.0-SNAPSHOT - - org.gcube.portlets.user - tabular-data-replacebyexternal-widget - 1.2.0-SNAPSHOT - - library - - tabular-data-replacebyexternal-widget-1.2.0-SNAPSHOT.jar - - - - - - - diff --git a/distro/INSTALL b/distro/INSTALL deleted file mode 100644 index e69de29..0000000 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 0bc9be3..0000000 --- a/distro/MAINTAINERS +++ /dev/null @@ -1 +0,0 @@ -Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" diff --git a/distro/README b/distro/README index 1a1ee13..739a430 100644 --- a/distro/README +++ b/distro/README @@ -1,48 +1,68 @@ -The gCube System - tabular-data-replacebyexternal-widget ------------------------------------------------------------- - -This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) +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 -------- +-------------------------------------------------- -Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, -Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" +* Giancarlo Panichi (giancarlo.panichi-AT-isti.cnr.it), + Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT - -Version and Release Date ------------------------- - -v. 1.2.0-SNAPSHOT (2015-07-03) - - -Description + +Maintainers ----------- + +* Giancarlo Panichi (giancarlo.panichi-AT-isti.cnr.it), + Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT -tabular-data-replacebyexternal-widget allows the replace of column by external tabular resource - - + Download information --------------------- -Source code is available from SVN: - https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-replacebyexternal-widget - -Binaries can be downloaded from: - http://software.d4science.research-infrastructures.eu/ - - +-------------------------------------------------- + +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: + https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager + + Documentation -------------- - -tabular-data-replacebyexternal-widget allows the replace of column by external tabular resource - -Documentation is available on-line from the Projects Documentation Wiki: - https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager - - +-------------------------------------------------- + +Documentation is available on-line in the gCube Wiki: + https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager + + +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/descriptor.xml b/distro/descriptor.xml similarity index 68% rename from templates/descriptor.xml rename to distro/descriptor.xml index b978636..b468e51 100644 --- a/templates/descriptor.xml +++ b/distro/descriptor.xml @@ -15,25 +15,18 @@ README LICENSE - INSTALL - MAINTAINERS changelog.xml + profile.xml 755 + true - ${distroDirectory}/svnpath.txt - /${artifactId} - - - ${configDirectory}/profile.xml - / - - - target/${build.finalName}.${packaging} + target/${build.finalName}.${project.packaging} /${artifactId} + \ No newline at end of file diff --git a/templates/profile.xml b/distro/profile.xml similarity index 97% rename from templates/profile.xml rename to distro/profile.xml index 19ed5bc..62ae9a7 100644 --- a/templates/profile.xml +++ b/distro/profile.xml @@ -1,7 +1,7 @@ - Service + Library ${project.description} PortletsUser diff --git a/distro/svnpath.txt b/distro/svnpath.txt deleted file mode 100644 index 00dca44..0000000 --- a/distro/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-replacebyexternal-widget \ No newline at end of file diff --git a/pom.xml b/pom.xml index a8b45c2..d427acd 100644 --- a/pom.xml +++ b/pom.xml @@ -35,21 +35,15 @@ - ${project.basedir}/distro ${project.build.directory}/${project.build.finalName} - 2015-07-03 - https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager - templates distro config - - 2.6.1 3.3.2 - 3.1.1 - + 3.1.1 + ${env.KEYS} UTF-8 @@ -88,14 +82,14 @@ ${gwtVersion} - + com.sencha.gxt gxt ${gxtVersion} - + @@ -120,8 +114,8 @@ [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) provided - - + + org.gcube.portlets.user @@ -130,7 +124,7 @@ provided - + com.allen-sauer.gwt.log @@ -143,7 +137,7 @@ org.slf4j slf4j-api - + junit @@ -151,7 +145,7 @@ 4.8.1 test - + @@ -198,87 +192,19 @@ - - - maven-resources-plugin - 2.6 - - - copy-profile - process-resources - - copy-resources - - - ${configDirectory} - - - ${templatesDirectory} - - profile.xml - - true - - - - - - copy-distro-resources - process-resources - - copy-resources - - - ${distroDirectory} - - - ${templatesDirectory} - - profile.xml - descriptor.xml - - 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 servicearchive - package + install single diff --git a/templates/INSTALL b/templates/INSTALL deleted file mode 100644 index e69de29..0000000 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 0bc9be3..0000000 --- a/templates/MAINTAINERS +++ /dev/null @@ -1 +0,0 @@ -Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" diff --git a/templates/README b/templates/README deleted file mode 100644 index 7e3ad55..0000000 --- a/templates/README +++ /dev/null @@ -1,48 +0,0 @@ -The gCube System - ${name} ------------------------------------------------------------- - -This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) - -Authors -------- - -Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, -Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - - -Version and Release Date ------------------------- - -v. ${version} (${release.date}) - - -Description ------------ - -${project.description} - - -Download information --------------------- -Source code is available from SVN: - ${scm.url} - -Binaries can be downloaded from: - http://software.d4science.research-infrastructures.eu/ - - -Documentation -------------- - -${project.description} - -Documentation is available on-line from the Projects Documentation Wiki: - ${wikiurl} - - -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 af7c9e8..0000000 --- a/templates/changelog.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - Updated dependencies - - - Updated dependency - - - First Release - - \ No newline at end of file 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