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
This commit is contained in:
Luca Frosini 2016-04-04 08:22:23 +00:00
parent afbb0be7ac
commit e51de3b0c2
13 changed files with 80 additions and 94 deletions

View File

@ -25,6 +25,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">

View File

@ -3,5 +3,5 @@
<fixed facet="wst.jsdt.web"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.7"/>
<installed facet="jst.web" version="3.1"/>
<installed facet="jst.web" version="3.0"/>
</faceted-project>

View File

@ -1 +0,0 @@
Used as service in the gCube Framework

View File

@ -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.
${gcube.license}

View File

@ -1,2 +0,0 @@
Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa,
Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".

View File

@ -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).
The gCube System - ${name}
--------------------------------------------------
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
-----------
${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
--------------------
--------------------------------------------------
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.

View File

@ -1,16 +1,18 @@
<ReleaseNotes>
<Changeset component="org.gcube.vre-management.smart-executor.1.4.0" date="2016-02-08">
<Change>Port SmartExecutor to be compliant with new Authorization (refs #2112)</Change>
<Changeset component="org.gcube.vre-management.smart-executor.1.4.0" date="${buildDate}">
<Change></Change>
</Changeset>
<Changeset component="org.gcube.vre-management.smart-executor.1.3.0" date="2015-12-23">
<Change>Use Persistence to persist Scheduled Task configuration on smart-executor (refs #579)</Change>
<Changeset component="org.gcube.vre-management.smart-executor.1.3.0" date="2016-02-08">
<Change>Using Persistence (CouchDB) to save Scheduled Task configuration (refs #579)</Change>
<Change>Added Unscheduling feature for repetitive task (refs #521)</Change>
</Changeset>
<Changeset component="org.gcube.vre-management.smart-executor.1.2.0" date="2015-11-30">
<Change>Support Unscheduling of repetitive task on SmartExecutor (refs #521)</Change>
<Changeset component="org.gcube.vre-management.smart-executor.1.2.0" date="2015-12-31">
<Change>Removed Support for Config File to run task at service startup</Change>
</Changeset>
<Changeset component="org.gcube.vre-management.smart-executor.1.1.0" date="2015-08-31">
<Changeset component="org.gcube.vre-management.smart-executor.1.1.0" date="2015-12-09">
<Change>Added Support for Config File to run task at service startup (refs #508)</Change>
<Change>Added Recurrent and Scheduled Task support (refs #111)</Change>
<Change>Saving Task Evolution on a global CouchDB (refs #89)</Change>
<Change>Saving Task Evolution on Persistence (CouchDB) (refs #89)</Change>
</Changeset>
<Changeset component="org.gcube.vre-management.smart-executor.1.0.0" date="2015-02-05">
<Change>First Release</Change>

View File

@ -15,9 +15,8 @@
<includes>
<include>README</include>
<include>LICENSE</include>
<include>INSTALL</include>
<include>MAINTAINERS</include>
<include>changelog.xml</include>
<include>profile.xml</include>
</includes>
<fileMode>755</fileMode>
<filtered>true</filtered>
@ -25,13 +24,8 @@
</fileSets>
<files>
<file>
<source>target/${build.finalName}.war</source>
<source>target/${build.finalName}.jar</source>
<outputDirectory>/${artifactId}</outputDirectory>
</file>
<file>
<source>${distroDirectory}/svnpath.txt</source>
<outputDirectory>/${artifactId}</outputDirectory>
<filtered>true</filtered>
</file>
</files>
</assembly>

View File

@ -1,5 +1,5 @@
<application mode='online'>
<group>${serviceClass}</group>
<group>VREManagement</group>
<name>${name}</name>
<version>${version}</version>
<description>${description}</description>

View File

@ -3,7 +3,7 @@
<ID></ID>
<Type>Service</Type>
<Profile>
<Class>${serviceClass}</Class>
<Class>VREManagement</Class>
<Name>${name}</Name>
<Description>${description}</Description>
<Version>1.0.0</Version>
@ -17,9 +17,9 @@
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
</MavenCoordinates>
<Type>Service</Type>
<Type>library</Type>
<Files>
<File>${build.finalName}.war</File>
<File>${build.finalName}.jar</File>
</Files>
</Software>
</Packages>

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpoints
xmlns="http://java.sun.com/xml/ns/jax-ws/ri/runtime"
version="2.0">
<endpoint
name="smart-executor"
implementation="org.gcube.vremanagement.executor.SmartExecutorImpl"
url-pattern="/gcube/vremanagement/smart-executor"/>
</endpoints>

View File

@ -1 +0,0 @@
${scm.url}

View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<listener>
<listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
</listener>
<servlet>
<servlet-name>smart-executor</servlet-name>
<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>smart-executor</servlet-name>
<url-pattern>/gcube/vremanagement/smart-executor</url-pattern>
</servlet-mapping>
</web-app>