keycloak-aplcache

Changes

distribution/subsystem-war/src/main/java/org/keycloak/provider/wildfly/InfinispanCacheActivator.java 29(+0 -29)

distribution/subsystem-war/src/main/resources/META-INF/services/org.jboss.msc.service.ServiceActivator 1(+0 -1)

Details

diff --git a/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakAdapterConfigService.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakAdapterConfigService.java
index 8f3a59d..1863549 100755
--- a/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakAdapterConfigService.java
+++ b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakAdapterConfigService.java
@@ -26,7 +26,7 @@ public final class KeycloakAdapterConfigService {
 
     static final KeycloakAdapterConfigService INSTANCE = new KeycloakAdapterConfigService();
 
-    static final String DEPLOYMENT_NAME = "keycloak-server";
+    static final String DEPLOYMENT_NAME = "keycloak-server.war";
 
     private String webContext;
 
diff --git a/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java
index e951c7f..150dbbd 100644
--- a/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java
+++ b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java
@@ -21,6 +21,8 @@ import org.jboss.as.server.deployment.DeploymentPhaseContext;
 import org.jboss.as.server.deployment.DeploymentUnit;
 import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
 import org.jboss.as.server.deployment.DeploymentUnitProcessor;
+import org.jboss.msc.service.ServiceName;
+import org.jboss.msc.service.ServiceTarget;
 
 /**
  * DUP responsible for setting the web context of a Keycloak auth server.
@@ -29,6 +31,8 @@ import org.jboss.as.server.deployment.DeploymentUnitProcessor;
  */
 public class KeycloakServerDeploymentProcessor implements DeploymentUnitProcessor {
 
+    private static final ServiceName cacheContainerService = ServiceName.of("jboss", "infinispan", "keycloak");
+
     @Override
     public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException {
         DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();
@@ -45,6 +49,19 @@ public class KeycloakServerDeploymentProcessor implements DeploymentUnitProcesso
             throw new DeploymentUnitProcessingException("Can't determine web context/module for Keycloak Server");
         }
         description.setModuleName(webContext);
+
+        addInfinispanCaches(phaseContext);
+    }
+
+    private void addInfinispanCaches(DeploymentPhaseContext context) {
+        if (context.getServiceRegistry().getService(cacheContainerService) != null) {
+            ServiceTarget st = context.getServiceTarget();
+            st.addDependency(cacheContainerService);
+            st.addDependency(cacheContainerService.append("realms"));
+            st.addDependency(cacheContainerService.append("users"));
+            st.addDependency(cacheContainerService.append("sessions"));
+            st.addDependency(cacheContainerService.append("loginFailures"));
+        }
     }
 
     @Override