From 50edc71829407ae24ef9ea473148d1d611650e41 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 5 Dec 2019 16:59:10 +0100
Subject: [PATCH] Fixed distro files and pom

---
 README.md      |  9 ++++-----
 descriptor.xml | 34 ----------------------------------
 pom.xml        | 23 +++++------------------
 profile.xml    | 27 ---------------------------
 4 files changed, 9 insertions(+), 84 deletions(-)
 delete mode 100644 descriptor.xml
 delete mode 100644 profile.xml

diff --git a/README.md b/README.md
index 2db3bfe..830bee6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# gCube Catalogue Service
+# Resource Registry Service
 
-This service allows any client to publish on the gCube Catalogue.
+The Resource Registry is a web-service which represent the core component of the gCube Information System
 
 ## Built With
 
@@ -25,10 +25,9 @@ Tell people how to cite this software.
 * Cite an associated paper?
 * Use a specific BibTeX entry for the software?
 
-
-    @Manual{,
+    @software{,
         title = {gCube Resource Registry Service},
-        author = {{Frosini, Luca}},
+        author = {Frosini, Luca},
         organization = {ISTI - CNR},
         address = {Pisa, Italy},
         year = 2019,
diff --git a/descriptor.xml b/descriptor.xml
deleted file mode 100644
index d3fcb34..0000000
--- a/descriptor.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xml>
-<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}${project.artifactId}</outputDirectory>
-		</file>
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 96dde44..de8f7ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,8 @@
 	<groupId>org.gcube.information-system</groupId>
 	<artifactId>resource-registry</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
-	<name>Resource Registry</name>
-	<description>Resource Registry</description>
+	<name>Resource Registry Service</name>
+	<description>The Resource Registry is a web-service which represent the core component of the gCube Information System</description>
 	<packaging>war</packaging>
 
 	<properties>
@@ -104,7 +104,7 @@
 		</dependency>
 	</dependencies>
 
-	<build>
+		<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -128,7 +128,6 @@
 									<includes>
 										<include>LICENSE.md</include>
 										<include>README.md</include>
-										<include>web.xml</include>
 										<include>gcube-app.xml</include>
 										<include>changelog.xml</include>
 									</includes>
@@ -138,28 +137,16 @@
 					</execution>
 				</executions>
 			</plugin>
-			
-			<!-- <finalName>${artifactId}</finalName> -->
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>descriptor.xml</descriptor>
-					</descriptors>
-				</configuration>
 				<executions>
 					<execution>
-						<id>servicearchive</id>
-						<phase>install</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
+						<id>make-servicearchive</id>
+						<phase>package</phase>
 					</execution>
 				</executions>
 			</plugin>
-
 		</plugins>
 	</build>
 </project>
diff --git a/profile.xml b/profile.xml
deleted file mode 100644
index e357af3..0000000
--- a/profile.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xml>
-<Resource>
-	<ID />
-	<Type>Service</Type>
-	<Profile>
-		<Description>${project.description}</Description>
-		<Class>${serviceClass}</Class>
-		<Name>${project.artifactId}</Name>
-		<Version>1.0.0</Version>
-		<Packages>
-			<Main>
-				<Name>${project.artifactId}</Name>
-				<Version>${project.version}</Version>
-				<Description>${project.description}</Description>
-				<MavenCoordinates>
-					<groupId>${project.groupId}</groupId>
-					<artifactId>${project.artifactId}</artifactId>
-					<version>${project.version}</version>
-				</MavenCoordinates>
-				<Files>
-					<File>${build.finalName}.${project.packaging}</File>
-				</Files>
-			</Main>
-		</Packages>
-	</Profile>
-</Resource>
\ No newline at end of file