From 8c6f0d43372d9846ef0d25d3abba69a92912adad Mon Sep 17 00:00:00 2001
From: Mauro Mugnaini <themaxx76@gmail.com>
Date: Tue, 4 Aug 2020 12:06:40 +0200
Subject: [PATCH] Fixed project layout and added sub-deployments for each
 module to add specific dependencies and reflected them in POM

---
 keycloak-d4science-spi-ear/pom.xml            | 33 +++++++++++-
 .../META-INF/jboss-deployment-structure.xml   | 53 +++++++++++++++++++
 .../META-INF/jboss-deployment-structure.xml   | 13 -----
 pom.xml                                       |  2 +-
 4 files changed, 85 insertions(+), 16 deletions(-)
 create mode 100644 keycloak-d4science-spi-ear/src/main/application/META-INF/jboss-deployment-structure.xml
 delete mode 100644 keycloak-d4science-spi-ear/src/main/resources/META-INF/jboss-deployment-structure.xml

diff --git a/keycloak-d4science-spi-ear/pom.xml b/keycloak-d4science-spi-ear/pom.xml
index 5fe6f6f..bb7fdce 100644
--- a/keycloak-d4science-spi-ear/pom.xml
+++ b/keycloak-d4science-spi-ear/pom.xml
@@ -50,8 +50,37 @@
 				<artifactId>maven-ear-plugin</artifactId>
 				<version>3.0.1</version>
 				<configuration>
-					<earSourceDirectory>src/main/resources</earSourceDirectory>
-					<includeLibInApplicationXml>true</includeLibInApplicationXml>
+					<defaultLibBundleDir>lib</defaultLibBundleDir>
+					<modules>
+<!-- 						<jarModule> -->
+<!-- 							<groupId>org.gcube</groupId> -->
+<!-- 							<artifactId>avatar-realm-resource</artifactId> -->
+<!-- 							<includeInApplicationXml>true</includeInApplicationXml> -->
+<!-- 							<bundleFileName>avatar-realm-resource.jar</bundleFileName> -->
+<!-- 							<bundleDir>/</bundleDir> -->
+<!-- 						</jarModule> -->
+						<jarModule>
+							<groupId>org.gcube</groupId>
+							<artifactId>event-listener-provider</artifactId>
+							<includeInApplicationXml>true</includeInApplicationXml>
+							<bundleFileName>event-listener-provider.jar</bundleFileName>
+							<bundleDir>/</bundleDir>
+						</jarModule>
+						<jarModule>
+							<groupId>org.gcube</groupId>
+							<artifactId>identity-provider-mapper</artifactId>
+							<includeInApplicationXml>true</includeInApplicationXml>
+							<bundleFileName>identity-provider-mapper.jar</bundleFileName>
+							<bundleDir>/</bundleDir>
+						</jarModule>
+						<jarModule>
+							<groupId>org.gcube</groupId>
+							<artifactId>ldap-storage-mapper</artifactId>
+							<includeInApplicationXml>true</includeInApplicationXml>
+							<bundleFileName>ldap-storage-mapper.jar</bundleFileName>
+							<bundleDir>/</bundleDir>
+						</jarModule>
+					</modules>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/keycloak-d4science-spi-ear/src/main/application/META-INF/jboss-deployment-structure.xml b/keycloak-d4science-spi-ear/src/main/application/META-INF/jboss-deployment-structure.xml
new file mode 100644
index 0000000..5134ad1
--- /dev/null
+++ b/keycloak-d4science-spi-ear/src/main/application/META-INF/jboss-deployment-structure.xml
@@ -0,0 +1,53 @@
+<jboss-deployment-structure>
+	<deployment>
+		<module-alias name="deployment.d4science.spi" />
+	</deployment>
+<!-- 	<sub-deployment name="avatar-realm-resource.jar"> -->
+<!-- 		<dependencies> -->
+<!-- 			<module name="javax.servlet.api" /> -->
+<!-- 			<module name="javax.ws.rs.api" /> -->
+<!-- 			<module name="org.hibernate" /> -->
+<!-- 			<module name="org.keycloak.keycloak-core" /> -->
+<!-- 			<module name="org.keycloak.keycloak-ldap-federation" /> -->
+<!-- 			<module name="org.keycloak.keycloak-server-spi" /> -->
+<!-- 			<module name="org.keycloak.keycloak-server-spi-private" /> -->
+<!-- 			<module name="org.keycloak.keycloak-services" /> -->
+<!-- 			<module name="org.jboss.logging" /> -->
+<!-- 			<module name="org.jboss.resteasy.resteasy-jaxb-provider" /> -->
+<!-- 			<module name="org.jboss.resteasy.resteasy-jaxrs" /> -->
+<!-- 			<module name="org.jboss.resteasy.resteasy-multipart-provider" /> -->
+<!-- 			<module name="org.slf4j" /> -->
+<!-- 		</dependencies> -->
+<!-- 	</sub-deployment> -->
+	<sub-deployment name="event-listener-provider.jar">
+		<dependencies>
+			<module name="org.keycloak.keycloak-core" />
+			<module name="org.keycloak.keycloak-server-spi" />
+			<module name="org.keycloak.keycloak-server-spi-private" />
+			<module name="org.keycloak.keycloak-services" />
+			<module name="org.jboss.logging" />
+			<module name="org.slf4j" />
+		</dependencies>
+	</sub-deployment>
+	<sub-deployment name="identity-provider-mapper.jar">
+		<dependencies>
+			<module name="org.keycloak.keycloak-core" />
+			<module name="org.keycloak.keycloak-server-spi" />
+			<module name="org.keycloak.keycloak-server-spi-private" />
+			<module name="org.keycloak.keycloak-services" />
+			<module name="org.jboss.logging" />
+			<module name="org.slf4j" />
+		</dependencies>
+	</sub-deployment>
+	<sub-deployment name="ldap-storage-mapper.jar">
+		<dependencies>
+			<module name="org.keycloak.keycloak-core" />
+			<module name="org.keycloak.keycloak-ldap-federation" />
+			<module name="org.keycloak.keycloak-server-spi" />
+			<module name="org.keycloak.keycloak-server-spi-private" />
+			<module name="org.keycloak.keycloak-services" />
+			<module name="org.jboss.logging" />
+			<module name="org.slf4j" />
+		</dependencies>
+	</sub-deployment>
+</jboss-deployment-structure>
\ No newline at end of file
diff --git a/keycloak-d4science-spi-ear/src/main/resources/META-INF/jboss-deployment-structure.xml b/keycloak-d4science-spi-ear/src/main/resources/META-INF/jboss-deployment-structure.xml
deleted file mode 100644
index 8f917cc..0000000
--- a/keycloak-d4science-spi-ear/src/main/resources/META-INF/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<jboss-deployment-structure>
-    <deployment>
-        <dependencies>
-            <module name="org.keycloak.keycloak-core"/>
-            <module name="org.keycloak.keycloak-ldap-federation"/>
-            <module name="org.keycloak.keycloak-server-spi"/>
-            <module name="org.keycloak.keycloak-server-spi-private"/>
-            <module name="org.keycloak.keycloak-services"/>
-            <module name="org.jboss.logging"/>
-            <module name="org.slf4j"/>
-        </dependencies>
-    </deployment>
-</jboss-deployment-structure>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 87aa106..eb1df93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>avatar-realm-resource</module>
+<!-- 		<module>avatar-realm-resource</module> -->
 		<module>event-listener-provider</module>
 		<module>identity-provider-mapper</module>
 		<module>keycloak-d4science-spi-ear</module>