diff --git a/.classpath b/.classpath
index 4f9b9b5..ace8266 100644
--- a/.classpath
+++ b/.classpath
@@ -1,32 +1,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/distro/LICENSE b/distro/LICENSE
new file mode 100755
index 0000000..2d9616a
--- /dev/null
+++ b/distro/LICENSE
@@ -0,0 +1 @@
+${gcube.license}
\ No newline at end of file
diff --git a/distro/README b/distro/README
new file mode 100755
index 0000000..6f61922
--- /dev/null
+++ b/distro/README
@@ -0,0 +1,64 @@
+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
+--------------------------------------------------
+
+* Pasquale Vitale (pasquale.vitale@eng.it), ENG, Roma, Engineering Ingegneria Informatica S.p.A..
+
+
+Maintainers
+-----------
+
+* Ciro Formisano (ciro.formisano@eng.it), ENG, Roma, Engineering Ingegneria Informatica S.p.A..
+
+Download information
+--------------------------------------------------
+
+Source code is available from SVN:
+ ${scm.url}
+
+Binaries can be downloaded from the gCube website:
+ ${gcube.website}
+
+
+Installation
+--------------------------------------------------
+
+Installation and usage example
+ ${gcube.wikiRoot}/Tabular_Data_Service
+
+Documentation
+--------------------------------------------------
+
+All needed information are available in Installation page
+
+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/templates/changelog.xml b/distro/changelog.xml
old mode 100644
new mode 100755
similarity index 100%
rename from templates/changelog.xml
rename to distro/changelog.xml
diff --git a/templates/descriptor.xml b/distro/descriptor.xml
old mode 100644
new mode 100755
similarity index 76%
rename from templates/descriptor.xml
rename to distro/descriptor.xml
index b978636..8d95035
--- a/templates/descriptor.xml
+++ b/distro/descriptor.xml
@@ -14,9 +14,6 @@
true
README
- LICENSE
- INSTALL
- MAINTAINERS
changelog.xml
755
@@ -24,11 +21,7 @@
-
- /${artifactId}
-
-
-
+
/
diff --git a/distro/profile.xml b/distro/profile.xml
new file mode 100755
index 0000000..7d9d0a7
--- /dev/null
+++ b/distro/profile.xml
@@ -0,0 +1,29 @@
+
+
+
+ Library
+
+ ${project.description}
+ DataAnalysis
+ ${project.artifactId}
+ 1.0.0
+
+
+ ${project.description}
+ ${project.artifactId}
+ ${project.version}
+
+ ${project.groupId}
+ ${project.artifactId}
+ ${project.version}
+
+ Library
+
+ ${project.build.finalName}.${project.packaging}
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 99229fc..ac43065 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,21 +14,6 @@
https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/gcube-geoserver-connector/
-
-
- Pasquale Vitale
- pasquale.vitale@eng.it
- ENG
-
-
-
-
- ${project.basedir}/distro
- ${project.basedir}/config
- ${project.basedir}/templates
- 2017-06-01
-
-
@@ -98,66 +83,12 @@
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.12.4
-
- true
-
-
-
- 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
-
-
-
-
-
-
-
+
org.apache.maven.plugins
maven-assembly-plugin
- 2.2
- ${templatesDirectory}/descriptor.xml
+ ${distroDirectory}/descriptor.xml
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 630ba97..0000000
--- a/templates/LICENSE
+++ /dev/null
@@ -1,6 +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.
diff --git a/templates/MAINTAINERS b/templates/MAINTAINERS
deleted file mode 100644
index da1c556..0000000
--- a/templates/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Pasquale Vitale (pasquale.vitale@eng.it), ENG Torre Annunziata,
-Engineering Ingegneria Informatica S.p.A.
\ No newline at end of file
diff --git a/templates/README b/templates/README
deleted file mode 100644
index 8443f71..0000000
--- a/templates/README
+++ /dev/null
@@ -1,37 +0,0 @@
-The gCube System - ${name}
-------------------------------------------------------------
-
-This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2)
-
-Authors
--------
-
-Pasquale Vitale (pasquale.vitale@eng.it), ENG Torre Annunziata,
-Engineering Ingegneria Informatica S.p.A.
-
-Version and Release Date
-------------------------
-
-v. ${version} (10-12-2012) * First release
-
-Description
------------
-
-
-Download information
---------------------
-
-
-
-Documentation
--------------
-
-
-
-Licensing
----------
-
-This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
-
-
-
diff --git a/templates/profile.xml b/templates/profile.xml
deleted file mode 100644
index c9e8e19..0000000
--- a/templates/profile.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- Service
-
- ${description}
- DataAnalysis
- ${artifactId}
- 1.0.0
-
-
- ${description}
- ${artifactId}
- ${version}
-
- ${groupId}
- ${artifactId}
- ${version}
-
- library
-
- ${artifactId}-${version}.${packaging}
-
-
-
-
-
-
-
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