diff --git a/distro/changelog.xml b/changelog.xml
similarity index 100%
rename from distro/changelog.xml
rename to changelog.xml
diff --git a/descriptor.xml b/descriptor.xml
new file mode 100644
index 0000000..31bb91a
--- /dev/null
+++ b/descriptor.xml
@@ -0,0 +1,32 @@
+
+ servicearchive
+
+ tar.gz
+
+ /
+
+
+ .
+ ${file.separator}
+ true
+
+ README.md
+ LICENSE.md
+ gcube-app.xml
+ changelog.xml
+ profile.xml
+
+ 755
+ true
+
+
+
+
+
+ ${file.separator}${artifactId}
+
+
+
\ No newline at end of file
diff --git a/distro/LICENSE b/distro/LICENSE
deleted file mode 100644
index cdf50bd..0000000
--- a/distro/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-gCube System - License
-------------------------------------------------------------
-
-${gcube.license}
\ No newline at end of file
diff --git a/distro/README b/distro/README
deleted file mode 100644
index d5d57c8..0000000
--- a/distro/README
+++ /dev/null
@@ -1,62 +0,0 @@
-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}
-
-Documentation
---------------------------------------------------
-
-Documentation is available on-line in the gCube Wiki:
- ${gcube.wikiRoot}
-
-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.
\ No newline at end of file
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
deleted file mode 100644
index ba2c192..0000000
--- a/distro/descriptor.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
- servicearchive
-
- tar.gz
-
- /
-
-
- ${distroDirectory}
- ${file.separator}
- true
-
- README
- LICENSE
- changelog.xml
- profile.xml
-
- 755
- true
-
-
-
-
-
- ${file.separator}${artifactId}
-
-
-
\ No newline at end of file
diff --git a/distro/gcube-app.xml b/gcube-app.xml
similarity index 100%
rename from distro/gcube-app.xml
rename to gcube-app.xml
diff --git a/pom.xml b/pom.xml
index 23203ee..8a6ac7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,6 @@
2.24.1
UTF-8
${project.basedir}/src/main/webapp/WEB-INF
-
- ${project.basedir}/distro
DataPublishing
@@ -270,7 +268,7 @@
${webappDirectory}
- ${distroDirectory}
+ ${project.basedir}
true
@@ -278,24 +276,29 @@
+
+
+
+
org.apache.maven.plugins
- maven-war-plugin
+ maven-assembly-plugin
- ${artifactId}
- false
-
+
+ descriptor.xml
+
servicearchive
install
- war
+ single
+
diff --git a/distro/profile.xml b/profile.xml
similarity index 50%
rename from distro/profile.xml
rename to profile.xml
index 3944037..3804732 100644
--- a/distro/profile.xml
+++ b/profile.xml
@@ -4,19 +4,19 @@
Service
- ${description}
+ ${project.description}
${serviceClass}
- ${artifactId}
+ ${project.artifactId}
1.0.0
- ${description}
- ${artifactId}
- ${version}
+ ${project.artifactId}
+ ${project.description}
+ ${project.version}
- ${groupId}
- ${artifactId}
- ${version}
+ ${project.groupId}
+ ${project.artifactId}
+ ${project.version}
${build.finalName}.${project.packaging}
diff --git a/distro/web.xml b/web.xml
similarity index 100%
rename from distro/web.xml
rename to web.xml