From fbf1ce194f13572a7a2d72c0543aecc89f334764 Mon Sep 17 00:00:00 2001
From: Mauro Mugnaini <mauro.mugnaini@nubisware.com>
Date: Wed, 16 Feb 2022 13:24:51 +0100
Subject: [PATCH] Enabling themes JAR building and inclusion in the EAR bundle

---
 keycloak-d4science-bundle/pom.xml                      |  4 ----
 .../META-INF/jboss-deployment-structure.xml            | 10 +++++-----
 pom.xml                                                |  2 --
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/keycloak-d4science-bundle/pom.xml b/keycloak-d4science-bundle/pom.xml
index 76540a5..3b57e35 100644
--- a/keycloak-d4science-bundle/pom.xml
+++ b/keycloak-d4science-bundle/pom.xml
@@ -51,13 +51,11 @@
 			<artifactId>identity-provider-mapper</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<!-- 
 		<dependency>
 			<groupId>org.gcube.iam</groupId>
 			<artifactId>keycloak-d4science-theme</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		-->
 		<dependency>
 			<groupId>org.gcube.iam</groupId>
 			<artifactId>ldap-storage-mapper</artifactId>
@@ -116,7 +114,6 @@
 							<bundleFileName>identity-provider-mapper.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
-						<!--
 						<jarModule>
 							<groupId>org.gcube.iam</groupId>
 							<artifactId>keycloak-d4science-theme</artifactId>
@@ -124,7 +121,6 @@
 							<bundleFileName>keycloak-d4science-theme.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
-						-->
 						<jarModule>
 							<groupId>org.gcube.iam</groupId>
 							<artifactId>ldap-storage-mapper</artifactId>
diff --git a/keycloak-d4science-bundle/src/main/application/META-INF/jboss-deployment-structure.xml b/keycloak-d4science-bundle/src/main/application/META-INF/jboss-deployment-structure.xml
index 5a5ad06..c53761f 100644
--- a/keycloak-d4science-bundle/src/main/application/META-INF/jboss-deployment-structure.xml
+++ b/keycloak-d4science-bundle/src/main/application/META-INF/jboss-deployment-structure.xml
@@ -70,11 +70,11 @@
 			<module name="org.slf4j" />
 		</dependencies>
 	</sub-deployment>
-<!-- 	<sub-deployment name="keycloak-d4science-theme.jar"> -->
-<!-- 		<dependencies> -->
-<!-- 			<module name="org.keycloak.keycloak-core" /> -->
-<!-- 		</dependencies> -->
-<!-- 	</sub-deployment> -->
+	<sub-deployment name="keycloak-d4science-theme.jar">
+		<dependencies>
+			<module name="org.keycloak.keycloak-core" />
+		</dependencies>
+	</sub-deployment>
 	<sub-deployment name="ldap-storage-mapper.jar">
 		<dependencies>
 			<module name="org.keycloak.keycloak-core" />
diff --git a/pom.xml b/pom.xml
index f60e87a..007439e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,7 @@
 		<module>delete-account</module>
 		<module>event-listener-provider</module>
 		<module>identity-provider-mapper</module>
-		<!-- 
 		<module>keycloak-d4science-theme</module>
-		-->
 		<module>ldap-storage-mapper</module>
 		<module>keycloak-d4science-bundle</module>
 	</modules>