From 8e56f120655f28c2db111b78bafd3e85695f24cf Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Mon, 7 Oct 2019 12:30:31 +0200
Subject: [PATCH] Removed distro directory, moved files in the component root

---
 distro/changelog.xml => changelog.xml |  0
 descriptor.xml                        | 32 ++++++++++++++
 distro/LICENSE                        |  4 --
 distro/README                         | 62 ---------------------------
 distro/descriptor.xml                 | 31 --------------
 distro/gcube-app.xml => gcube-app.xml |  0
 pom.xml                               | 19 ++++----
 distro/profile.xml => profile.xml     | 16 +++----
 distro/web.xml => web.xml             |  0
 9 files changed, 51 insertions(+), 113 deletions(-)
 rename distro/changelog.xml => changelog.xml (100%)
 create mode 100644 descriptor.xml
 delete mode 100644 distro/LICENSE
 delete mode 100644 distro/README
 delete mode 100644 distro/descriptor.xml
 rename distro/gcube-app.xml => gcube-app.xml (100%)
 rename distro/profile.xml => profile.xml (50%)
 rename distro/web.xml => web.xml (100%)

diff --git a/distro/changelog.xml b/changelog.xml
similarity index 100%
rename from distro/changelog.xml
rename to changelog.xml
diff --git a/descriptor.xml b/descriptor.xml
new file mode 100644
index 0000000..31bb91a
--- /dev/null
+++ b/descriptor.xml
@@ -0,0 +1,32 @@
+<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>
+    </formats>
+    <baseDirectory>/</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>.</directory>
+            <outputDirectory>${file.separator}</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+            <includes>
+                <include>README.md</include>
+                <include>LICENSE.md</include>
+                <include>gcube-app.xml</include>
+                <include>changelog.xml</include>
+                <include>profile.xml</include>
+            </includes>
+            <fileMode>755</fileMode>
+            <filtered>true</filtered>
+        </fileSet>
+    </fileSets>
+    <files>
+        <file>
+            <source>target${file.separator}${build.finalName}.${project.packaging}</source>
+            <outputDirectory>${file.separator}${artifactId}</outputDirectory>
+        </file>
+    </files>
+</assembly>
\ No newline at end of file
diff --git a/distro/LICENSE b/distro/LICENSE
deleted file mode 100644
index cdf50bd..0000000
--- a/distro/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-gCube System - License
-------------------------------------------------------------
-
-${gcube.license}
\ No newline at end of file
diff --git a/distro/README b/distro/README
deleted file mode 100644
index d5d57c8..0000000
--- a/distro/README
+++ /dev/null
@@ -1,62 +0,0 @@
-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
---------------------------------------------------
-
-* 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} 
- 
-Documentation 
---------------------------------------------------
- 
-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.
\ No newline at end of file
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
deleted file mode 100644
index ba2c192..0000000
--- a/distro/descriptor.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<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>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>${file.separator}</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-				<include>profile.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>target${file.separator}${build.finalName}.${project.packaging}</source>
-			<outputDirectory>${file.separator}${artifactId}</outputDirectory>
-		</file>
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/distro/gcube-app.xml b/gcube-app.xml
similarity index 100%
rename from distro/gcube-app.xml
rename to gcube-app.xml
diff --git a/pom.xml b/pom.xml
index 23203ee..8a6ac7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,6 @@
 		<version.jersey>2.24.1</version.jersey>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory>
-		<!-- webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory -->
-		<distroDirectory>${project.basedir}/distro</distroDirectory>
 		<serviceClass>DataPublishing</serviceClass>
 	</properties>
 
@@ -270,7 +268,7 @@
 							<outputDirectory>${webappDirectory}</outputDirectory>
 							<resources>
 								<resource>
-									<directory>${distroDirectory}</directory>
+									<directory>${project.basedir}</directory>
 									<filtering>true</filtering>
 								</resource>
 							</resources>
@@ -278,24 +276,29 @@
 					</execution>
 				</executions>
 			</plugin>
+		
+		<!-- <finalName>${artifactId}</finalName> -->
+		
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
+				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
-					<warName>${artifactId}</warName>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<!-- webXml>src\main\webapp\WEB-INF\web.xml</webXml -->
+					<descriptors>
+						<descriptor>descriptor.xml</descriptor>
+					</descriptors>
 				</configuration>
 				<executions>
 					<execution>
 						<id>servicearchive</id>
 						<phase>install</phase>
 						<goals>
-							<goal>war</goal>
+							<goal>single</goal>
 						</goals>
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 	</build>
 </project>
diff --git a/distro/profile.xml b/profile.xml
similarity index 50%
rename from distro/profile.xml
rename to profile.xml
index 3944037..3804732 100644
--- a/distro/profile.xml
+++ b/profile.xml
@@ -4,19 +4,19 @@
 	<ID />
 	<Type>Service</Type>
 	<Profile>
-		<Description>${description}</Description>
+		<Description>${project.description}</Description>
 		<Class>${serviceClass}</Class>
-		<Name>${artifactId}</Name>
+		<Name>${project.artifactId}</Name>
 		<Version>1.0.0</Version>
 		<Packages>
 			<Main>
-				<Description>${description}</Description>
-				<Name>${artifactId}</Name>
-				<Version>${version}</Version>
+				<Name>${project.artifactId}</Name>
+				<Description>${project.description}</Description>
+				<Version>${project.version}</Version>
 				<MavenCoordinates>
-					<groupId>${groupId}</groupId>
-					<artifactId>${artifactId}</artifactId>
-					<version>${version}</version>
+					<groupId>${project.groupId}</groupId>
+					<artifactId>${project.artifactId}</artifactId>
+					<version>${project.version}</version>
 				</MavenCoordinates>
 				<Files>
 					<File>${build.finalName}.${project.packaging}</File>
diff --git a/distro/web.xml b/web.xml
similarity index 100%
rename from distro/web.xml
rename to web.xml