diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index 8d1c8b6..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/distro/LICENSE b/distro/LICENSE
index 630ba97..cdf50bd 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,6 +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 a08f4b5..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-*Alessandro Pieve (alessandro.pieve@isti.cnr.it), CNR, Italy
\ No newline at end of file
diff --git a/distro/README b/distro/README
index fb46150..f4e98f4 100644
--- a/distro/README
+++ b/distro/README
@@ -1,38 +1,66 @@
-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).
-
+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
--------
-
+--------------------------------------------------
+
* Alessandro Pieve (alessandro.pieve@isti.cnr.it), CNR, Italy
-
-Version and Release Date
-------------------------
-${version}
-
-Description
+
+
+Maintainers
-----------
-${description}
-
+
+* Alessandro Pieve (alessandro.pieve@isti.cnr.it), CNR, Italy
+
+
Download information
---------------------
-
-Source code is available from SVN:
-${scm.url}
-
-Binaries can be downloaded from:
-
-
+--------------------------------------------------
+
+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 from the Projects Documentation Wiki:
-https://gcube.wiki.gcube-system.org/gcube/index.php/....
-
-
+--------------------------------------------------
+
+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.
+--------------------------------------------------
+
+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/changelog.xml b/distro/changelog.xml
index 1df49a3..0682013 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,5 +1,6 @@
-
+
First Release
-
\ No newline at end of file
+
+
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index 21d8c88..fe8e699 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,9 +15,8 @@
README
LICENSE
- INSTALL
- MAINTAINERS
changelog.xml
+ profile.xml
755
true
@@ -25,18 +24,9 @@
-
- /
- true
-
-
-
+
/${artifactId}
-
-
- /${artifactId}
- true
-
+
-
\ No newline at end of file
+
diff --git a/distro/profile.xml b/distro/profile.xml
index 91c49e4..e33ae54 100644
--- a/distro/profile.xml
+++ b/distro/profile.xml
@@ -1,26 +1,27 @@
-
-
- Service
-
- ${description}
- Common
- ${artifactId}
+
+
+ Service
+
+ ${description}
+ DataAccess
+ ${artifactId}
1.0.0
-
-
- ${artifactId}
+
+
+ ${description}
+ ${artifactId}
${version}
${groupId}
${artifactId}
${version}
+ library
- ${build.finalName}.jar
+ ${build.finalName}.war
-
-
-
+
+
+
-
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index f416f9d..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-${scm.url}
diff --git a/distro/web.xml b/distro/web.xml
new file mode 100644
index 0000000..b2117ac
--- /dev/null
+++ b/distro/web.xml
@@ -0,0 +1,7 @@
+
+
+
+ Quota Library
+
diff --git a/pom.xml b/pom.xml
index b6aed0e..724d50c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
quota-library
jar
1.0.0-SNAPSHOT
- quota-service Maven Webapp
+ quota-library
maven-parent
org.gcube.tools
@@ -32,12 +32,12 @@
org.gcube.accounting
accounting-analytics
- [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
+ [2.4.0-SNAPSHOT,3.0.0-SNAPSHOT)
org.gcube.accounting
accounting-lib
- [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
+ [2.4.0-SNAPSHOT,3.0.0-SNAPSHOT)
@@ -91,4 +91,5 @@
+ Quota Library
diff --git a/src/main/java/org/gcube/resource/management/quota/library/status/QuotaStorageStatus.java b/src/main/java/org/gcube/resource/management/quota/library/status/QuotaStorageStatus.java
index 82c5d30..0945274 100644
--- a/src/main/java/org/gcube/resource/management/quota/library/status/QuotaStorageStatus.java
+++ b/src/main/java/org/gcube/resource/management/quota/library/status/QuotaStorageStatus.java
@@ -4,8 +4,6 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
-import org.gcube.resource.management.quota.library.quotalist.AccessType;
-import org.gcube.resource.management.quota.library.quotalist.CallerType;
import org.gcube.resource.management.quota.library.quotalist.TimeInterval;
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 9f88c1f..b2117ac 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -3,5 +3,5 @@
"http://java.sun.com/dtd/web-app_2_3.dtd" >
- Archetype Created Web Application
+ Quota Library