Fixing distro directory

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@126982 82a268e6-3cf1-43bd-a215-b396298e98cf

distro/INSTALL

@@ -1 +0,0 @@
-Used as library in the gCube Framework

distro/LICENSE

@@ -1,8 +1,4 @@
 gCube System - License
 ------------------------------------------------------------
 
-The gCube/gCore software is licensed as Free Open Source software conveying to 
+${gcube.license}
-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.

distro/MAINTAINERS

@@ -1,2 +0,0 @@
-Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa, 
-Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".

distro/README

@@ -1,32 +1,65 @@
-The gCube System - Accounting Common Library
+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
--------
-
-* Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
-
-This work has been conceptually derived from accounting-common component made by: 
-* Paolo Fabriani (paolo.fabriani@eng.it) Engineering Ingegneria Informatica S.p.A.
-* Ermanno Travaglino (ermanno.travaglino@eng.it) Engineering Ingegneria Informatica S.p.A.
-
-Version and Release Date
-------------------------
-
-v 1.0, 19/05/2015
-v 1.1, 30/09/2015 
-  
-
-Description
------------
-
 ${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}/Accounting_Lib
+ 
+ 
+Documentation 
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/Accounting_Lib
+ 
+ 
+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,19 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.accounting.accounting-lib.1-1-0" date="2015-09-30">
+	<Changeset component="org.gcube.accounting.accounting-lib.2-2-0" date="${buildDate}">
+		<Change>Removed dependency over reflection library (refs #2358)</Change>
+	</Changeset>
+    <Changeset component="org.gcube.accounting.accounting-lib.2-1-0" date="2016-04-08">
+		<Change>Ready for ScopeProvider Removal #2194</Change>
+		<Change>Fixed Bug on StorageUsageRecord aggregation #2316</Change>
+		<Change>Fixed Bug on Recovery of UsageRecords accounted on Fallback</Change>
+	</Changeset>
+    <Changeset component="org.gcube.accounting.accounting-lib.2-0-0" date="2016-02-08">
+		<Change>Separated Accounting Model and generalize solution. the library now depends from document-store-lib #1746</Change>
+		<Change>Managed UsageRecords discovered dinamically on classpath #1295</Change>
+		<Change>Persistence is re-checked every 10 min when Fallback is used #1349</Change>
+		<Change>Repetitive thread retry to persist UsageRecords accounted on Fallback #1352</Change>
+	</Changeset>
+	<Changeset component="org.gcube.accounting.accounting-lib.1-1-0" date="2015-12-09">
 		<Change>Changed Single and Aggregated classes names to avoid mistakes for the developers.</Change>	
 	</Changeset>
 	<Changeset component="org.gcube.accounting.accounting-lib.1-0-0" date="2015-05-27">

distro/descriptor.xml

@@ -15,28 +15,17 @@
 			<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>
 		</fileSet>
 	</fileSets>
 	<files>
-		<file>
-			<source>${distroDirectory}/profile.xml</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,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Resource>
-	<ID></ID>
+	<ID />
 	<Type>Service</Type>
 	<Profile>
-		<Class>Accounting</Class>
-		<Name>${artifactId}</Name>
 		<Description>${description}</Description>
+		<Class>${serviceClass}</Class>
+		<Name>${artifactId}</Name>
 		<Version>1.0.0</Version>
 		<Packages>
 			<Software>
-				<Description>${description}</Description>
 				<Name>${artifactId}</Name>
 				<Version>${version}</Version>
 				<MavenCoordinates>
@@ -17,7 +16,6 @@
 					<artifactId>${artifactId}</artifactId>
 					<version>${version}</version>
 				</MavenCoordinates>
-				<Type>library</Type>
 				<Files>
 					<File>${build.finalName}.jar</File>
 				</Files>

distro/svnpath.txt

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

pom.xml

@@ -18,6 +18,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
+		<serviceClass>Accounting</serviceClass>
 	</properties>
 
 	<scm>
@@ -78,5 +79,28 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
+	
+	<build>
+	    <plugins>
+	        <plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>servicearchive</id>
+						<phase>install</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+	    </plugins>
+	</build>
+	
 </project>