Fixing distro directory

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

distro/INSTALL

@@ -1 +0,0 @@
-Used as a plugin of SmartExecutor

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 - Smart Executor Service Client 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".
-  
-  
-Version and Release Date
-------------------------
-
-v. 1.0.0  * First release
-    
-        
-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}/SmartExecutor
+ 
+ 
+Documentation 
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/SmartExecutor
+ 
+ 
+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,5 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.accounting.accounting-aggregator.1-0-0" date="2015-09-29">
+	<Changeset component="org.gcube.accounting.accounting-aggregator-se-plugin.1.0.0" date="${buildDate}">
 		<Change>First Release</Change>	
 	</Changeset>
 </ReleaseNotes>

distro/descriptor.xml

@@ -15,34 +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>
-		<fileSet>
-			<directory>target/apidocs</directory>
-			<outputDirectory>/${artifactId}/doc/api</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<fileMode>755</fileMode>
-		</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,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Resource>
 	<ID />
-	<Type>Service</Type>
+	<Type>Plugin</Type>
 	<Profile>
-		<Class>Accounting</Class>
-		<Name>${artifactId}</Name>
 		<Description>{description}</Description>
-		<Version>${version}</Version>
+		<Class>${serviceClass}</Class>
+		<Name>${artifactId}</Name>
+		<Version>1.0.0</Version>
 		<Packages>
 			<Software>
 				<Description>{description}</Description>
@@ -17,7 +17,7 @@
 					<artifactId>${artifactId}</artifactId>
 					<version>${version}</version>
 				</MavenCoordinates>
-				<Type>library</Type>
+				<Type>Plugin</Type>
 				<Files>
 					<File>${build.finalName}.jar</File>
 				</Files>

distro/svnpath.txt

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

pom.xml

@@ -9,8 +9,8 @@
 	<groupId>org.gcube.accounting</groupId>
 	<artifactId>accounting-aggregator-se-plugin</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
-	<name>accounting-aggregator</name>
+	<name>Accounting Aggregator</name>
-	<description>Accountign Aggregator Smart Executor Plugin</description>
+	<description>Accounting Aggregator Smart Executor Plugin</description>
 
 	<dependencyManagement>
 		<dependencies>
@@ -26,8 +26,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<metaInfDirectory>src/main/resources/META-INF/services</metaInfDirectory>
 		<distroDirectory>distro</distroDirectory>
+		<serviceClass>Accounting</serviceClass>
 	</properties>
 
 	<scm>
@@ -41,10 +41,12 @@
 			<groupId>org.gcube.vremanagement</groupId>
 			<artifactId>smart-executor-api</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-lib</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -52,7 +54,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- CouchDB libraries -->
+		<!-- CouchDB libraries
 		<dependency>
 			<groupId>org.ektorp</groupId>
 			<artifactId>org.ektorp</artifactId>
@@ -65,7 +67,7 @@
 			<version>1.9.7</version>
 			<type>jar</type>
 		</dependency>
-		<!-- END CouchDB libraries -->
+		END CouchDB libraries -->
 
 		<dependency>
 			<groupId>junit</groupId>
@@ -84,12 +86,30 @@
 	<build>
 		<plugins>
 			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
-				<version>2.3.2</version>
+				<artifactId>maven-resources-plugin</artifactId>
-				<configuration>
+				<version>2.5</version>
-					<source>1.7</source>
+				<executions>
-					<target>1.7</target>
+					<execution>
-				</configuration>
+						<id>copy-profile</id>
+						<phase>install</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${distroDirectory}</directory>
+									<filtering>true</filtering>
+									<includes>
+										<include>profile.xml</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -109,6 +129,23 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>