git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/resource-management/quota-library@144291 82a268e6-3cf1-43bd-a215-b396298e98cf

distro/INSTALL

@@ -1 +0,0 @@
- 

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).
+${gcube.license}
-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.

distro/MAINTAINERS

@@ -1 +0,0 @@
-*Alessandro Pieve (alessandro.pieve@isti.cnr.it), CNR, Italy

distro/README

@@ -1,38 +1,66 @@
 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.
  
-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).
  
 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}
+    ${scm.url}
  
-Binaries can be downloaded from:
+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.

distro/changelog.xml

@@ -1,5 +1,6 @@
 <ReleaseNotes>
-	<Changeset component="quota-library-1.0.0" date="2016-10-15">
+	<Changeset component="quota-library-1.0.0" date="2017-02-24">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
+

distro/descriptor.xml

@@ -15,9 +15,8 @@
 			<includes>
 				<include>README</include>
 				<include>LICENSE</include>
-				<include>INSTALL</include>
-				<include>MAINTAINERS</include>
 				<include>changelog.xml</include>
+                <include>profile.xml</include>
 			</includes>
 			<fileMode>755</fileMode>
 			<filtered>true</filtered>
@@ -25,18 +24,9 @@
 	</fileSets>
 	<files>
 		<file>
-			<source>${distroDirectory}/profile.xml</source>
+			<source>target/${build.finalName}.${project.packaging}</source>
-			<outputDirectory>/</outputDirectory>
-			<filtered>true</filtered>
-		</file>
-		<file>
-			<source>target/${build.finalName}.jar</source>
 			<outputDirectory>/${artifactId}</outputDirectory>
 		</file>
-		<file>
+
-			<source>${distroDirectory}/svnpath.txt</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-			<filtered>true</filtered>
-		</file>
 	</files>
 </assembly>

distro/profile.xml

@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Resource>
-	<ID />
+    <ID></ID>
-	<Type>Service</Type>
+    <Type>Service</Type>
-	<Profile>
+    <Profile>
-		<Description>${description}</Description>
+    	<Description>${description}</Description>
-		<Class>Common</Class>
+        <Class>DataAccess</Class>
-		<Name>${artifactId}</Name>
+        <Name>${artifactId}</Name>
 		<Version>1.0.0</Version>
-		<Packages>
+        <Packages>
-			<Software>
+            <Software>
-				<Name>${artifactId}</Name>
+                <Description>${description}</Description>
+            	<Name>${artifactId}</Name>
 				<Version>${version}</Version>
 				<MavenCoordinates>
 					<groupId>${groupId}</groupId>
 					<artifactId>${artifactId}</artifactId>
 					<version>${version}</version>
 				</MavenCoordinates>
+				<Type>library</Type>
 				<Files>
-					<File>${build.finalName}.jar</File>
+					<File>${build.finalName}.war</File>
 				</Files>
 			</Software>           
-		</Packages>
+        </Packages>
-	</Profile>
+    </Profile>
 </Resource>
-

distro/svnpath.txt

@@ -1 +0,0 @@
-${scm.url} 

distro/web.xml

@@ -0,0 +1,7 @@
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+  <display-name>Quota Library</display-name>
+</web-app>

pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>quota-library</artifactId>
 	<packaging>jar</packaging>
 	<version>1.0.0-SNAPSHOT</version>
-	<name>quota-service Maven Webapp</name>
+	<name>quota-library</name>
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
@@ -32,12 +32,12 @@
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-analytics</artifactId>
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+			<version>[2.4.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-lib</artifactId>
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+			<version>[2.4.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
 	
 	</dependencies>
@@ -91,4 +91,5 @@
 		</plugins>
 	</build>
 
+	<description>Quota Library </description>
 </project>

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;
 
 

src/main/webapp/WEB-INF/web.xml

@@ -3,5 +3,5 @@
  "http://java.sun.com/dtd/web-app_2_3.dtd" >
 
 <web-app>
-  <display-name>Archetype Created Web Application</display-name>
+  <display-name>Quota Library</display-name>
 </web-app>