From 25883010a9fd2857c3549d749bece4d75112732d Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 16 Mar 2016 09:38:48 +0000 Subject: [PATCH] Fixed distro git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/acegwt-widget@125367 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 22 +++---- config/profile.xml | 29 -------- distro/INSTALL | 0 distro/LICENSE | 9 ++- distro/MAINTAINERS | 1 - distro/README | 98 ++++++++++++++++------------ distro/changelog.xml | 5 +- {templates => distro}/descriptor.xml | 16 +---- {templates => distro}/profile.xml | 2 +- distro/svnpath.txt | 1 - pom.xml | 85 ++---------------------- templates/INSTALL | 0 templates/LICENSE | 13 ---- templates/MAINTAINERS | 1 - templates/README | 50 -------------- templates/changelog.xml | 5 -- templates/svnpath.txt | 1 - 17 files changed, 85 insertions(+), 253 deletions(-) delete mode 100644 config/profile.xml delete mode 100644 distro/INSTALL delete mode 100644 distro/MAINTAINERS rename {templates => distro}/descriptor.xml (63%) rename {templates => distro}/profile.xml (100%) 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/.classpath b/.classpath index 142a959..8af4004 100644 --- a/.classpath +++ b/.classpath @@ -6,17 +6,6 @@ - - - - - - - - - - - @@ -28,5 +17,16 @@ + + + + + + + + + + + diff --git a/config/profile.xml b/config/profile.xml deleted file mode 100644 index b5f3447..0000000 --- a/config/profile.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - Service - - An AceGWT integration - PortletsUser - acegwt-widget - 1.0.0 - - - An AceGWT integration - acegwt-widget - 1.0.0-SNAPSHOT - - org.gcube.portlets.widgets - acegwt-widget - 1.0.0-SNAPSHOT - - webapplication - - acegwt-widget-1.0.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 6ec0741..62f68cb 100644 --- a/distro/LICENSE +++ b/distro/LICENSE @@ -1,9 +1,8 @@ -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. +============ + +AceGWT Licence Part of this work has been derived by AceGWT.AceGWT integrates the Ajax.org Code Editor (ACE) into the Google Web Toolkit (GWT) . AceGWT is distributed under the MIT license: http://www.opensource.org/licenses/mit-license.php 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 f8469bf..b15aced 100644 --- a/distro/README +++ b/distro/README @@ -1,50 +1,68 @@ -The gCube System - acegwt-widget ------------------------------------------------------------- - -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), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1). +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.0.0-SNAPSHOT (2016-02-28) - - -Description + +Maintainers ----------- + +* Giancarlo Panichi (giancarlo.panichi-AT-isti.cnr.it), + Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT -An AceGWT integration - - + Download information --------------------- -Source code is available from SVN: - https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/acegwt-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/Statistical_Runner + + Documentation -------------- - -An AceGWT integration - -Documentation is available on-line from the Projects Documentation Wiki: - https://gcube.wiki.gcube-system.org/gcube/index.php/Statistical_Runner - - +-------------------------------------------------- + +Documentation is available on-line in the gCube Wiki: + https://gcube.wiki.gcube-system.org/gcube/index.php/Statistical_Runner + + +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 73101d3..e6b3b99 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,5 +1,8 @@ - + + Updated distro + + First Release \ No newline at end of file diff --git a/templates/descriptor.xml b/distro/descriptor.xml similarity index 63% rename from templates/descriptor.xml rename to distro/descriptor.xml index 9e88168..dc46ade 100644 --- a/templates/descriptor.xml +++ b/distro/descriptor.xml @@ -15,26 +15,16 @@ README LICENSE - INSTALL - MAINTAINERS changelog.xml 755 + true - ${distroDirectory}/svnpath.txt - /${artifactId}-${version} + target/${build.finalName}.${project.packaging} + /${artifactId} - - ${configDirectory}/profile.xml - / - - - target/${project.build.finalName}.${packaging} - /${artifactId}-${version} - - \ No newline at end of file diff --git a/templates/profile.xml b/distro/profile.xml similarity index 100% rename from templates/profile.xml rename to distro/profile.xml index 13575d1..d662b6f 100644 --- a/templates/profile.xml +++ b/distro/profile.xml @@ -9,8 +9,8 @@ 1.0.0 - ${project.description} ${project.name} + ${project.description} ${version} ${project.groupId} diff --git a/distro/svnpath.txt b/distro/svnpath.txt deleted file mode 100644 index 5e3f84a..0000000 --- a/distro/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/acegwt-widget \ No newline at end of file diff --git a/pom.xml b/pom.xml index b10ca67..d7747e9 100644 --- a/pom.xml +++ b/pom.xml @@ -38,11 +38,7 @@ - ${project.basedir}/distro ${project.build.directory}/${project.build.finalName} - 2016-02-28 - https://gcube.wiki.gcube-system.org/gcube/index.php/Statistical_Runner - templates distro config @@ -101,7 +97,7 @@ - + com.allen-sauer.gwt.log @@ -216,99 +212,26 @@ - - - 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 - ${project.build.finalName} 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 6ec0741..0000000 --- a/templates/LICENSE +++ /dev/null @@ -1,13 +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. - -Part of this work has been derived by AceGWT.AceGWT integrates the Ajax.org Code Editor (ACE) into the Google Web Toolkit (GWT) . -AceGWT is distributed under the MIT license: http://www.opensource.org/licenses/mit-license.php -You can download original AceGWT source code from https://github.com/daveho/AceGWT -You can find the Ajax.org Code Editor (ACE) licence at https://github.com/ajaxorg/ace/blob/master/LICENSE). -More infromation on Ajax.org Code Editor (ACE) can be found at https://ace.c9.io/ -Ajax.org Code Editor (ACE) source code can be found at https://github.com/ajaxorg/ace 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 38bf491..0000000 --- a/templates/README +++ /dev/null @@ -1,50 +0,0 @@ -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), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1). - -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 f6911f3..0000000 --- a/templates/changelog.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 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