From a90161080ba797067484ce11a3372adde0ff76b3 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 8 Jan 2019 14:00:18 +0000
Subject: [PATCH] Moving resources to ensure loading

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/gcubedatacatalogue-metadata-discovery@176359 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    |  10 +-
 pom.xml                                       | 107 +-----------------
 .../DataCalogueMetadataFormatReader.java      |   2 +-
 .../Gdcmetadataprofilev3.xsd                  |   0
 .../NamespacesCatalogueCategories.xsd         |   0
 5 files changed, 10 insertions(+), 109 deletions(-)
 rename src/main/{resources => java/org/gcube/datacatalogue/metadatadiscovery}/Gdcmetadataprofilev3.xsd (100%)
 rename src/main/{resources => java/org/gcube/datacatalogue/metadatadiscovery}/NamespacesCatalogueCategories.xsd (100%)

diff --git a/.classpath b/.classpath
index d07777b..ace8266 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/gcubedatacatalogue-metadata-discovery-3.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -28,5 +32,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/gcubedatacatalogue-metadata-discovery-3.4.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/pom.xml b/pom.xml
index 5378994..536daee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,120 +124,17 @@
 	</dependencies>
 
 	<build>
-		<!-- Generate compiled stuff in the folder used for developing mode -->
-		<outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/*.*</include>
-				</includes>
-			</resource>
-		</resources>
-
 		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>${maven.compiler.source}</source>
-					<target>${maven.compiler.target}</target>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.2</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.16</version>
-				<configuration>
-					<skipTests>true</skipTests>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.5</version>
-				<executions>
-					<execution>
-						<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>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2</version>
-				<configuration>
-					<descriptors>
-						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-					</descriptors>
-					<archive>
-						<manifest>
-							<mainClass>fully.qualified.MainClass</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
 				<executions>
 					<execution>
-						<id>servicearchive</id>
-						<phase>install</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
+						<id>make-servicearchive</id>
+						<phase>package</phase>
 					</execution>
 				</executions>
 			</plugin>
-			<!-- <plugin> -->
-			<!-- <artifactId>maven-clean-plugin</artifactId> -->
-			<!-- <version>2.5</version> -->
-			<!-- <configuration> -->
-			<!-- <filesets> -->
-			<!-- <fileset> -->
-			<!-- <directory>${distroDirectory}</directory> -->
-			<!-- <includes> -->
-			<!-- <include>**</include> -->
-			<!-- </includes> -->
-			<!-- <followSymlinks>false</followSymlinks> -->
-			<!-- </fileset> -->
-			<!-- <fileset> -->
-			<!-- <directory>${configDirectory}</directory> -->
-			<!-- <includes> -->
-			<!-- <include>**</include> -->
-			<!-- </includes> -->
-			<!-- <followSymlinks>false</followSymlinks> -->
-			<!-- </fileset> -->
-			<!-- </filesets> -->
-			<!-- </configuration> -->
-			<!-- </plugin> -->
 		</plugins>
 	</build>
 </project>
diff --git a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/DataCalogueMetadataFormatReader.java b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/DataCalogueMetadataFormatReader.java
index 79fb112..e2dac15 100644
--- a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/DataCalogueMetadataFormatReader.java
+++ b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/DataCalogueMetadataFormatReader.java
@@ -179,7 +179,7 @@ public class DataCalogueMetadataFormatReader implements DataCatalogueMetadataDis
 	}
 	
 	static InputStream getProfileSchemaInputStream() {
-		return DataCalogueMetadataFormatReader.class.getClassLoader().getResourceAsStream(SCHEMA_FILENAME);
+		return DataCalogueMetadataFormatReader.class.getResourceAsStream(SCHEMA_FILENAME);
 	}
 	
 	static void validateAgainstXSD(StreamSource xml, StreamSource xsd) throws SAXException, IOException {
diff --git a/src/main/resources/Gdcmetadataprofilev3.xsd b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/Gdcmetadataprofilev3.xsd
similarity index 100%
rename from src/main/resources/Gdcmetadataprofilev3.xsd
rename to src/main/java/org/gcube/datacatalogue/metadatadiscovery/Gdcmetadataprofilev3.xsd
diff --git a/src/main/resources/NamespacesCatalogueCategories.xsd b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/NamespacesCatalogueCategories.xsd
similarity index 100%
rename from src/main/resources/NamespacesCatalogueCategories.xsd
rename to src/main/java/org/gcube/datacatalogue/metadatadiscovery/NamespacesCatalogueCategories.xsd