diff --git a/config/profile.xml b/config/profile.xml
deleted file mode 100644
index 791aa52..0000000
--- a/config/profile.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- Library
-
- accounting-manager-theme is the theme of accounting-manager
- PortletsAdmin
- accounting-manager-theme
- 1.0.0
-
-
- accounting-manager-theme is the theme of accounting-manager
- accounting-manager-theme
- 1.1.0-SNAPSHOT
-
- org.gcube.portlets.admin
- accounting-manager-theme
- 1.1.0-SNAPSHOT
-
- webapplication
-
- accounting-manager-theme-1.1.0-SNAPSHOT.jar
-
-
-
-
-
-
-
diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index e69de29..0000000
diff --git a/distro/LICENSE b/distro/LICENSE
index cc51139..2d9616a 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,6 +1 @@
-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 0bc9be3..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
diff --git a/distro/README b/distro/README
index 178896b..685a273 100644
--- a/distro/README
+++ b/distro/README
@@ -1,50 +1,68 @@
-The gCube System - accounting-manager-theme
-------------------------------------------------------------
-
-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).
+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
--------
+--------------------------------------------------
-Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa,
-Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
+* Giancarlo Panichi (giancarlo.panichi-AT-isti.cnr.it),
+ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT
-
-Version and Release Date
-------------------------
-
-v. 1.1.0-SNAPSHOT (2016-01-31)
-
-
-Description
+
+Maintainers
-----------
+
+* Giancarlo Panichi (giancarlo.panichi-AT-isti.cnr.it),
+ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT
-accounting-manager-theme is the theme of accounting-manager
-
-
+
Download information
---------------------
-Source code is available from SVN:
- https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager-theme
-
-Binaries can be downloaded from:
- http://software.d4science.research-infrastructures.eu/
-
-
+--------------------------------------------------
+
+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:
+ https://gcube.wiki.gcube-system.org/gcube/index.php/Accounting_Manager
+
+
Documentation
--------------
-
-accounting-manager-theme is the theme of accounting-manager
-
-Documentation is available on-line from the Projects Documentation Wiki:
- https://gcube.wiki.gcube-system.org/gcube/index.php/Accounting_Manager
-
-
+--------------------------------------------------
+
+Documentation is available on-line in the gCube Wiki:
+ https://gcube.wiki.gcube-system.org/gcube/index.php/Accounting_Manager
+
+
+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 9241b92..b283607 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,8 +1,8 @@
-
+
Updated icon
-
+
First Release
\ No newline at end of file
diff --git a/templates/descriptor.xml b/distro/descriptor.xml
similarity index 63%
rename from templates/descriptor.xml
rename to distro/descriptor.xml
index 9e88168..dc46ade 100644
--- a/templates/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,26 +15,16 @@
README
LICENSE
- INSTALL
- MAINTAINERS
changelog.xml
755
+ true
-
- /${artifactId}-${version}
+
+ /${artifactId}
-
-
- /
-
-
-
- /${artifactId}-${version}
-
-
\ No newline at end of file
diff --git a/templates/profile.xml b/distro/profile.xml
similarity index 92%
rename from templates/profile.xml
rename to distro/profile.xml
index ef71be0..d662b6f 100644
--- a/templates/profile.xml
+++ b/distro/profile.xml
@@ -1,16 +1,16 @@
- Library
+ Service
${project.description}
- PortletsAdmin
+ PortletsUser
${project.name}
1.0.0
- ${project.description}
${project.name}
+ ${project.description}
${version}
${project.groupId}
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index 160f4a3..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager-theme
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4b306db..84bbfc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
1.0.0
-
+
4.0.0
org.gcube.portlets.admin
accounting-manager-theme
@@ -37,11 +37,8 @@
- ${project.basedir}/distro
${project.build.directory}/${project.build.finalName}
- 2016-01-31
- https://gcube.wiki.gcube-system.org/gcube/index.php/Accounting_Manager
- templates
+
distro
config
@@ -98,78 +95,6 @@
1.7
-
-
-
-
-
- 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
-
-
-
-
-
-
-
-
- maven-clean-plugin
- 2.5
-
-
-
- ${distroDirectory}
-
- **
-
- false
-
-
- ${configDirectory}
-
- **
-
- false
-
-
-
-
@@ -179,23 +104,20 @@
2.2
- ${templatesDirectory}/descriptor.xml
+ ${distroDirectory}/descriptor.xml
- ${project.build.finalName}
servicearchive
- package
+ install
single
-
-
-
+
\ No newline at end of file
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 cc51139..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.
\ No newline at end of file
diff --git a/templates/MAINTAINERS b/templates/MAINTAINERS
deleted file mode 100644
index 0bc9be3..0000000
--- a/templates/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
diff --git a/templates/README b/templates/README
deleted file mode 100644
index 38bf491..0000000
--- a/templates/README
+++ /dev/null
@@ -1,50 +0,0 @@
-The gCube System - ${name}
-------------------------------------------------------------
-
-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
--------
-
-Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa,
-Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
-
-
-Version and Release Date
-------------------------
-
-v. ${version} (${release.date})
-
-
-Description
------------
-
-${project.description}
-
-
-Download information
---------------------
-Source code is available from SVN:
- ${scm.url}
-
-Binaries can be downloaded from:
- http://software.d4science.research-infrastructures.eu/
-
-
-Documentation
--------------
-
-${project.description}
-
-Documentation is available on-line from the Projects Documentation Wiki:
- ${wikiurl}
-
-
-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/templates/changelog.xml
deleted file mode 100644
index b283607..0000000
--- a/templates/changelog.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Updated icon
-
-
- First Release
-
-
\ No newline at end of file
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