From a945d82b5862be741f33f4b282e7dc56d51a663f Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Mon, 30 Oct 2017 13:44:13 +0000
Subject: [PATCH] fixed distro directory

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor@158002 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/descriptor.xml |  8 +++++---
 distro/profile.xml    | 13 +++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index df3081a..ba2c192 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -1,5 +1,7 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
 	<id>servicearchive</id>
 	<formats>
 		<format>tar.gz</format>
@@ -22,7 +24,7 @@
 	</fileSets>
 	<files>
 		<file>
-			<source>target${file.separator}${build.finalName}.war</source>
+			<source>target${file.separator}${build.finalName}.${project.packaging}</source>
 			<outputDirectory>${file.separator}${artifactId}</outputDirectory>
 		</file>
 	</files>
diff --git a/distro/profile.xml b/distro/profile.xml
index e7a30cf..0e765e0 100644
--- a/distro/profile.xml
+++ b/distro/profile.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xml>
 <Resource>
-	<ID></ID>
+	<ID />
 	<Type>Service</Type>
 	<Profile>
-		<Class>${serviceClass}</Class>
-		<Name>${name}</Name>
 		<Description>${description}</Description>
+		<Class>${serviceClass}</Class>
+		<Name>${artifactId}</Name>
 		<Version>1.0.0</Version>
 		<Packages>
 			<Main>
@@ -18,9 +18,10 @@
 					<artifactId>${artifactId}</artifactId>
 					<version>${version}</version>
 				</MavenCoordinates>
+				<Files>
+					<File>${build.finalName}.${project.packaging}</File>
+				</Files>
 			</Main>
 		</Packages>
 	</Profile>
-</Resource>
-
-
+</Resource>
\ No newline at end of file