libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Merge pull request #4013 from stianst/KEYCLOAK-4702

Browse source 
KEYCLOAK-4702 Use service dependency on jndi entry for caches
This commit is contained in:
Stian Thorgersen 2017-04-06 15:44:21 +02:00 committed by GitHub
commit 2876a98a97
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java
View file

@ -16,7 +16,9 @@
*/ */
package org.keycloak.subsystem.server.extension; package org.keycloak.subsystem.server.extension;
import org.jboss.as.controller.capability.CapabilityServiceSupport;
import org.jboss.as.ee.component.EEModuleDescription; import org.jboss.as.ee.component.EEModuleDescription;
import org.jboss.as.server.deployment.Attachments;
import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnit;
import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
@ -38,13 +40,15 @@ import java.util.List;
*/ */
public class KeycloakServerDeploymentProcessor implements DeploymentUnitProcessor { public class KeycloakServerDeploymentProcessor implements DeploymentUnitProcessor {
private static final String[] CACHES = new String[] {
"realms", "users","sessions","offlineSessions","loginFailures","work","authorization","keys"
};
// This param name is defined again in Keycloak Services class // This param name is defined again in Keycloak Services class
// org.keycloak.services.resources.KeycloakApplication. We have this value in // org.keycloak.services.resources.KeycloakApplication. We have this value in
// two places to avoid dependency between Keycloak Subsystem and Keyclaok Services module. // two places to avoid dependency between Keycloak Subsystem and Keyclaok Services module.
public static final String KEYCLOAK_CONFIG_PARAM_NAME = "org.keycloak.server-subsystem.Config"; public static final String KEYCLOAK_CONFIG_PARAM_NAME = "org.keycloak.server-subsystem.Config";
private static final ServiceName cacheContainerService = ServiceName.of("jboss", "infinispan", "keycloak");
@Override @Override
public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException {
DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();
@ -80,7 +84,7 @@ public class KeycloakServerDeploymentProcessor implements DeploymentUnitProcesso
List<ParamValueMetaData> contextParams = webMetaData.getContextParams(); List<ParamValueMetaData> contextParams = webMetaData.getContextParams();
if (contextParams == null) { if (contextParams == null) {
contextParams = new ArrayList<ParamValueMetaData>(); contextParams = new ArrayList<>();
} }
ParamValueMetaData param = new ParamValueMetaData(); ParamValueMetaData param = new ParamValueMetaData();
@ -92,17 +96,22 @@ public class KeycloakServerDeploymentProcessor implements DeploymentUnitProcesso
} }
private void addInfinispanCaches(DeploymentPhaseContext context) { private void addInfinispanCaches(DeploymentPhaseContext context) {
if (context.getServiceRegistry().getService(cacheContainerService) != null) { // TODO Can be removed once we upgrade to WildFly 11
ServiceName wf10CacheContainerService = ServiceName.of("jboss", "infinispan", "keycloak");
boolean legacy = context.getServiceRegistry().getService(wf10CacheContainerService) != null;
if (!legacy) {
ServiceTarget st = context.getServiceTarget(); ServiceTarget st = context.getServiceTarget();
st.addDependency(cacheContainerService); CapabilityServiceSupport support = context.getDeploymentUnit().getAttachment(Attachments.CAPABILITY_SERVICE_SUPPORT);
st.addDependency(cacheContainerService.append("realms")); for (String c : CACHES) {
st.addDependency(cacheContainerService.append("users")); ServiceName sn = support.getCapabilityServiceName("org.wildfly.clustering.infinispan.cache.keycloak." + c);
st.addDependency(cacheContainerService.append("sessions")); st.addDependency(sn);
st.addDependency(cacheContainerService.append("offlineSessions")); }
st.addDependency(cacheContainerService.append("loginFailures")); } else {
st.addDependency(cacheContainerService.append("work")); ServiceTarget st = context.getServiceTarget();
st.addDependency(cacheContainerService.append("authorization")); for (String c : CACHES) {
st.addDependency(cacheContainerService.append("keys")); st.addDependency(wf10CacheContainerService.append(c));
}
} }
} }