From e51de3b0c2fa8e5b21918e07ca05817cf1026fff Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 4 Apr 2016 08:22:23 +0000 Subject: [PATCH] Merged distro directory form branch git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor@126690 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 1 + ....eclipse.wst.common.project.facet.core.xml | 2 +- distro/INSTALL | 1 - distro/LICENSE | 6 +- distro/MAINTAINERS | 2 - distro/README | 95 ++++++++++++------- distro/changelog.xml | 18 ++-- distro/descriptor.xml | 10 +- distro/gcube-app.xml | 2 +- distro/profile.xml | 6 +- distro/sun-jaxws.xml | 9 -- distro/svnpath.txt | 1 - distro/web.xml | 21 ---- 13 files changed, 80 insertions(+), 94 deletions(-) delete mode 100644 distro/INSTALL delete mode 100644 distro/MAINTAINERS delete mode 100644 distro/sun-jaxws.xml delete mode 100644 distro/svnpath.txt delete mode 100644 distro/web.xml diff --git a/.classpath b/.classpath index 953de0b..d3c5af8 100644 --- a/.classpath +++ b/.classpath @@ -25,6 +25,7 @@ + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 45fbdef..50e7352 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -3,5 +3,5 @@ - + diff --git a/distro/INSTALL b/distro/INSTALL deleted file mode 100644 index 9ffa442..0000000 --- a/distro/INSTALL +++ /dev/null @@ -1 +0,0 @@ -Used as service in the gCube Framework \ No newline at end of file diff --git a/distro/LICENSE b/distro/LICENSE index 07f22ed..cdf50bd 100644 --- a/distro/LICENSE +++ b/distro/LICENSE @@ -1,8 +1,4 @@ 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 2cdfd00..0000000 --- a/distro/MAINTAINERS +++ /dev/null @@ -1,2 +0,0 @@ -Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa, -Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo". diff --git a/distro/README b/distro/README index 6ad786c..ae26293 100644 --- a/distro/README +++ b/distro/README @@ -1,38 +1,65 @@ -The gCube System - Smart Executor Service ------------------------------------------------------------- -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), -EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), -BlueBridge (H2020-EINFRA-2015-1). - - -Authors -------- -* Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa, - Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo". - - -Version and Release Date ------------------------- -See changelog.xml file in this directory. - - -Description ------------ +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 +-------------------------------------------------- + +* Luca Frosini (luca.frosini-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). + +Maintainers +----------- + +* Luca Frosini (luca.frosini-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). + + Download information --------------------- -${scm.url} - - +-------------------------------------------------- + +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}/SmartExecutor + + Documentation -------------- -${wiki} - +-------------------------------------------------- + +Documentation is available on-line in the gCube Wiki: + ${gcube.wikiRoot}/SmartExecutor + + +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. +-------------------------------------------------- + +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 1199acf..5c004cc 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,16 +1,18 @@ - - Port SmartExecutor to be compliant with new Authorization (refs #2112) + + - - Use Persistence to persist Scheduled Task configuration on smart-executor (refs #579) + + Using Persistence (CouchDB) to save Scheduled Task configuration (refs #579) + Added Unscheduling feature for repetitive task (refs #521) - - Support Unscheduling of repetitive task on SmartExecutor (refs #521) + + Removed Support for Config File to run task at service startup - + + Added Support for Config File to run task at service startup (refs #508) Added Recurrent and Scheduled Task support (refs #111) - Saving Task Evolution on a global CouchDB (refs #89) + Saving Task Evolution on Persistence (CouchDB) (refs #89) First Release diff --git a/distro/descriptor.xml b/distro/descriptor.xml index 4c080a2..089683d 100644 --- a/distro/descriptor.xml +++ b/distro/descriptor.xml @@ -15,9 +15,8 @@ README LICENSE - INSTALL - MAINTAINERS changelog.xml + profile.xml 755 true @@ -25,13 +24,8 @@ - target/${build.finalName}.war + target/${build.finalName}.jar /${artifactId} - - ${distroDirectory}/svnpath.txt - /${artifactId} - true - \ No newline at end of file diff --git a/distro/gcube-app.xml b/distro/gcube-app.xml index 0938e60..ca265cb 100644 --- a/distro/gcube-app.xml +++ b/distro/gcube-app.xml @@ -1,5 +1,5 @@ - ${serviceClass} + VREManagement ${name} ${version} ${description} diff --git a/distro/profile.xml b/distro/profile.xml index c369ead..9345072 100644 --- a/distro/profile.xml +++ b/distro/profile.xml @@ -3,7 +3,7 @@ Service - ${serviceClass} + VREManagement ${name} ${description} 1.0.0 @@ -17,9 +17,9 @@ ${artifactId} ${version} - Service + library - ${build.finalName}.war + ${build.finalName}.jar diff --git a/distro/sun-jaxws.xml b/distro/sun-jaxws.xml deleted file mode 100644 index ec39cd6..0000000 --- a/distro/sun-jaxws.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/distro/svnpath.txt b/distro/svnpath.txt deleted file mode 100644 index dcd0d22..0000000 --- a/distro/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -${scm.url} \ No newline at end of file diff --git a/distro/web.xml b/distro/web.xml deleted file mode 100644 index d93248c..0000000 --- a/distro/web.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - com.sun.xml.ws.transport.http.servlet.WSServletContextListener - - - - smart-executor - com.sun.xml.ws.transport.http.servlet.WSServlet - - - - smart-executor - /gcube/vremanagement/smart-executor - - - \ No newline at end of file