diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index e0b544a..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-Used as a plugin of SmartExecutor
\ No newline at end of file
diff --git a/distro/LICENSE b/distro/LICENSE
index bd0c2b4..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.
+${gcube.license}
\ No newline at end of file
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index ba9c41c..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"
\ No newline at end of file
diff --git a/distro/README b/distro/README
index f406d70..ae26293 100644
--- a/distro/README
+++ b/distro/README
@@ -1,32 +1,65 @@
-The gCube System - Smart Executor Service Client Library
-
-------------------------------------------------------------
-
-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
--------
-
-* Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa,
- Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
-
-
-Version and Release Date
-------------------------
-
-v. 1.0.0 * First release
-
-
-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
+--------------------------------------------------
+
+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
+--------------------------------------------------
+
+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.
-
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 0be7c2f..68fa5b6 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 c468f13..089683d 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,34 +15,17 @@
README
LICENSE
- INSTALL
- MAINTAINERS
changelog.xml
+ profile.xml
755
true
-
- target/apidocs
- /${artifactId}/doc/api
- true
- 755
-
-
- ${distroDirectory}/profile.xml
- ./
- true
-
target/${build.finalName}.jar
/${artifactId}
-
- ${distroDirectory}/svnpath.txt
- /${artifactId}
- true
-
\ No newline at end of file
diff --git a/distro/profile.xml b/distro/profile.xml
index a3c41bd..940b176 100644
--- a/distro/profile.xml
+++ b/distro/profile.xml
@@ -1,12 +1,12 @@
- Service
+ Plugin
- Accounting
- ${artifactId}
{description}
- ${version}
+ ${serviceClass}
+ ${artifactId}
+ 1.0.0
{description}
@@ -17,7 +17,7 @@
${artifactId}
${version}
- library
+ Plugin
${build.finalName}.jar
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index edacb04..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-${scm.url}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e9375d5..d4c7311 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
org.gcube.accounting
accounting-aggregator-se-plugin
1.0.0-SNAPSHOT
- accounting-aggregator
- Accountign Aggregator Smart Executor Plugin
+ Accounting Aggregator
+ Accounting Aggregator Smart Executor Plugin
@@ -26,8 +26,8 @@
UTF-8
- src/main/resources/META-INF/services
distro
+ Accounting
@@ -41,10 +41,12 @@
org.gcube.vremanagement
smart-executor-api
[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ provided
org.gcube.accounting
accounting-lib
+ provided
org.slf4j
@@ -52,7 +54,7 @@
provided
-
+
+ END CouchDB libraries -->
junit
@@ -84,12 +86,30 @@
- maven-compiler-plugin
- 2.3.2
-
- 1.7
- 1.7
-
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 2.5
+
+
+ copy-profile
+ install
+
+ copy-resources
+
+
+ target
+
+
+ ${distroDirectory}
+ true
+
+ profile.xml
+
+
+
+
+
+
org.apache.maven.plugins
@@ -109,6 +129,23 @@
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+
+ jar-with-dependencies
+
+
+
+
+ package
+
+ single
+
+
+
+
\ No newline at end of file