diff --git a/distribution/appliance-dist/pom.xml b/distribution/appliance-dist/pom.xml index 00d50f61bf..c5c4b19f3e 100755 --- a/distribution/appliance-dist/pom.xml +++ b/distribution/appliance-dist/pom.xml @@ -80,6 +80,33 @@ + + org.codehaus.mojo + xml-maven-plugin + 1.0 + + + generate-resources + package + + transform + + + + + ${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration + src/main/xslt/standalone.xsl + + standalone*.xml + + ${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration + + + ${project.build.directory} + + + + maven-assembly-plugin 2.4 diff --git a/distribution/appliance-dist/src/main/xslt/standalone.xsl b/distribution/appliance-dist/src/main/xslt/standalone.xsl new file mode 100755 index 0000000000..87c76357f1 --- /dev/null +++ b/distribution/appliance-dist/src/main/xslt/standalone.xsl @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/distribution/examples-docs-zip/build.xml b/distribution/examples-docs-zip/build.xml index 5f7a9a6b29..9c1006d43c 100755 --- a/distribution/examples-docs-zip/build.xml +++ b/distribution/examples-docs-zip/build.xml @@ -2,35 +2,13 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - @@ -41,6 +19,9 @@ + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml index f760b12395..e42ded8ab0 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml +++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml @@ -39,7 +39,7 @@ - + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml index f3090c1278..774b27997f 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml +++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml @@ -38,7 +38,7 @@ - + diff --git a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.as7 b/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml similarity index 68% rename from examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.as7 rename to examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml index e972711a03..71457a4422 100755 --- a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.as7 +++ b/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -1,12 +1,9 @@ - - - \ No newline at end of file diff --git a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.wildfly b/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.wildfly deleted file mode 100755 index 5cea82c04e..0000000000 --- a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.wildfly +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-web.xml b/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-web.xml deleted file mode 100755 index 42df73f16c..0000000000 --- a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-web.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - org.keycloak.adapters.as7.KeycloakAuthenticatorValve - - \ No newline at end of file diff --git a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/web.xml b/examples/demo-template/customer-app/src/main/webapp/WEB-INF/web.xml index 608f9a24a8..e83402d297 100755 --- a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/web.xml +++ b/examples/demo-template/customer-app/src/main/webapp/WEB-INF/web.xml @@ -36,7 +36,7 @@ --> - BASIC + KEYCLOAK demo diff --git a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/web.xml.wildfly b/examples/demo-template/customer-app/src/main/webapp/WEB-INF/web.xml.unconfigured similarity index 94% rename from examples/demo-template/customer-app/src/main/webapp/WEB-INF/web.xml.wildfly rename to examples/demo-template/customer-app/src/main/webapp/WEB-INF/web.xml.unconfigured index ac37d2ea51..608f9a24a8 100755 --- a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/web.xml.wildfly +++ b/examples/demo-template/customer-app/src/main/webapp/WEB-INF/web.xml.unconfigured @@ -36,8 +36,8 @@ --> - KEYCLOAK - commerce + BASIC + demo diff --git a/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.as7 b/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.as7 deleted file mode 100755 index 8749019c0d..0000000000 --- a/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.as7 +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.wildfly b/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.wildfly deleted file mode 100755 index a3e05a0de9..0000000000 --- a/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.wildfly +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-web.xml b/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-web.xml deleted file mode 100755 index 42df73f16c..0000000000 --- a/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-web.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - org.keycloak.adapters.as7.KeycloakAuthenticatorValve - - \ No newline at end of file diff --git a/examples/demo-template/database-service/src/main/webapp/WEB-INF/web.xml b/examples/demo-template/database-service/src/main/webapp/WEB-INF/web.xml index 830ac59346..dd90e3a331 100755 --- a/examples/demo-template/database-service/src/main/webapp/WEB-INF/web.xml +++ b/examples/demo-template/database-service/src/main/webapp/WEB-INF/web.xml @@ -19,7 +19,7 @@ - BASIC + KEYCLOAK demo diff --git a/examples/demo-template/database-service/src/main/webapp/WEB-INF/web.xml.wildfly b/examples/demo-template/database-service/src/main/webapp/WEB-INF/web.xml.unconfigured similarity index 90% rename from examples/demo-template/database-service/src/main/webapp/WEB-INF/web.xml.wildfly rename to examples/demo-template/database-service/src/main/webapp/WEB-INF/web.xml.unconfigured index 4ef7108e41..830ac59346 100755 --- a/examples/demo-template/database-service/src/main/webapp/WEB-INF/web.xml.wildfly +++ b/examples/demo-template/database-service/src/main/webapp/WEB-INF/web.xml.unconfigured @@ -19,8 +19,8 @@ - KEYCLOAK - commerce + BASIC + demo diff --git a/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.as7 b/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml similarity index 68% rename from examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.as7 rename to examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml index e972711a03..71457a4422 100755 --- a/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.as7 +++ b/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -1,12 +1,9 @@ - - - \ No newline at end of file diff --git a/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.wildfly b/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.wildfly deleted file mode 100755 index 5cea82c04e..0000000000 --- a/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml.wildfly +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-web.xml b/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-web.xml deleted file mode 100755 index 42df73f16c..0000000000 --- a/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-web.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - org.keycloak.adapters.as7.KeycloakAuthenticatorValve - - \ No newline at end of file diff --git a/examples/demo-template/product-app/src/main/webapp/WEB-INF/web.xml b/examples/demo-template/product-app/src/main/webapp/WEB-INF/web.xml index f590136fa3..f489a65e66 100755 --- a/examples/demo-template/product-app/src/main/webapp/WEB-INF/web.xml +++ b/examples/demo-template/product-app/src/main/webapp/WEB-INF/web.xml @@ -36,7 +36,7 @@ --> - BASIC + KEYCLOAK demo diff --git a/examples/demo-template/product-app/src/main/webapp/WEB-INF/web.xml.wildfly b/examples/demo-template/product-app/src/main/webapp/WEB-INF/web.xml.unconfigured similarity index 94% rename from examples/demo-template/product-app/src/main/webapp/WEB-INF/web.xml.wildfly rename to examples/demo-template/product-app/src/main/webapp/WEB-INF/web.xml.unconfigured index bfcffb8fd8..f590136fa3 100755 --- a/examples/demo-template/product-app/src/main/webapp/WEB-INF/web.xml.wildfly +++ b/examples/demo-template/product-app/src/main/webapp/WEB-INF/web.xml.unconfigured @@ -36,8 +36,8 @@ --> - KEYCLOAK - commerce + BASIC + demo diff --git a/examples/demo-template/subsystem-config.xml b/examples/demo-template/subsystem-config.xml new file mode 100755 index 0000000000..76a427d363 --- /dev/null +++ b/examples/demo-template/subsystem-config.xml @@ -0,0 +1,20 @@ + + + + MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB + http://localhost:8080/auth + true + + customer-portal + password + + + product-portal + password + + + database + password + + + diff --git a/examples/demo-template/third-party-cdi/src/main/webapp/WEB-INF/web.xml.wildfly b/examples/demo-template/third-party-cdi/src/main/webapp/WEB-INF/web.xml.wildfly deleted file mode 100755 index 93e1ef63c4..0000000000 --- a/examples/demo-template/third-party-cdi/src/main/webapp/WEB-INF/web.xml.wildfly +++ /dev/null @@ -1,20 +0,0 @@ - - - - oauth-client-cdi - - - - diff --git a/examples/demo-template/third-party/src/main/webapp/WEB-INF/web.xml.wildfly b/examples/demo-template/third-party/src/main/webapp/WEB-INF/web.xml.wildfly deleted file mode 100755 index 958839db9f..0000000000 --- a/examples/demo-template/third-party/src/main/webapp/WEB-INF/web.xml.wildfly +++ /dev/null @@ -1,23 +0,0 @@ - - - - oauth-client - - - org.keycloak.example.oauth.Bootstrap - - - - diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/TokenGrantRequest.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/TokenGrantRequest.java index 76fdf4b06d..9340ce1c6a 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/TokenGrantRequest.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/TokenGrantRequest.java @@ -14,6 +14,7 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.util.KeycloakUriBuilder; import org.keycloak.util.StreamUtil; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -77,7 +78,18 @@ public class TokenGrantRequest { } InputStream is = entity.getContent(); try { - return JsonSerialization.readValue(is, AccessTokenResponse.class); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + int c; + while ((c = is.read()) != -1) { + os.write(c); + } + byte[] bytes = os.toByteArray(); + String json = new String(bytes); + try { + return JsonSerialization.readValue(json, AccessTokenResponse.class); + } catch (IOException e) { + throw new IOException(json, e); + } } finally { try { is.close(); diff --git a/integration/as7-eap-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigDeploymentProcessor.java b/integration/as7-eap-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigDeploymentProcessor.java index c60769eaf4..e3a7c4b716 100755 --- a/integration/as7-eap-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigDeploymentProcessor.java +++ b/integration/as7-eap-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigDeploymentProcessor.java @@ -59,6 +59,18 @@ public class KeycloakAdapterConfigDeploymentProcessor implements DeploymentUnitP if (service.isKeycloakDeployment(deploymentName)) { addKeycloakAuthData(phaseContext, deploymentName, service); + return; + } + + // else check to see if KEYCLOAK is specified as login config + WarMetaData warMetaData = deploymentUnit.getAttachment(WarMetaData.ATTACHMENT_KEY); + if (warMetaData == null) return; + JBossWebMetaData webMetaData = warMetaData.getMergedJBossWebMetaData(); + if (webMetaData == null) return; + + LoginConfigMetaData loginConfig = webMetaData.getLoginConfig(); + if (loginConfig != null && loginConfig.getAuthMethod().equalsIgnoreCase("KEYCLOAK")) { + addValve(webMetaData); } } @@ -72,6 +84,18 @@ public class KeycloakAdapterConfigDeploymentProcessor implements DeploymentUnitP webMetaData = new JBossWebMetaData(); warMetaData.setMergedJBossWebMetaData(webMetaData); } + addValve(webMetaData); + + LoginConfigMetaData loginConfig = webMetaData.getLoginConfig(); + if (loginConfig == null) { + loginConfig = new LoginConfigMetaData(); + webMetaData.setLoginConfig(loginConfig); + } + loginConfig.setAuthMethod("KEYCLOAK"); + loginConfig.setRealmName(service.getRealmName(deploymentName)); + } + + private void addValve(JBossWebMetaData webMetaData) { List valves = webMetaData.getValves(); if (valves == null) { valves = new ArrayList(1); @@ -80,19 +104,8 @@ public class KeycloakAdapterConfigDeploymentProcessor implements DeploymentUnitP ValveMetaData valve = new ValveMetaData(); valve.setValveClass(KeycloakAuthenticatorValve.class.getName()); valve.setModule("org.keycloak.keycloak-as7-adapter"); - log.info("******* adding Keycloak valve to: " + deploymentName); + //log.info("******* adding Keycloak valve to: " + deploymentName); valves.add(valve); - - /* - LoginConfigMetaData loginConfig = webMetaData.getLoginConfig(); - if (loginConfig == null) { - loginConfig = new LoginConfigMetaData(); - webMetaData.setLoginConfig(loginConfig); - } - loginConfig.setAuthMethod("KEYCLOAK"); - loginConfig.setRealmName(service.getRealmName(deploymentName)); - */ - } private void addJSONData(String json, WarMetaData warMetaData) { diff --git a/integration/as7-eap-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java b/integration/as7-eap-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java index 889d8fa936..2ac2ccfb88 100755 --- a/integration/as7-eap-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java +++ b/integration/as7-eap-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java @@ -36,16 +36,14 @@ public class KeycloakDependencyProcessor implements DeploymentUnitProcessor { private static final ModuleIdentifier KEYCLOAK_AS7_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-as7-adapter"); private static final ModuleIdentifier KEYCLOAK_CORE_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-adapter-core"); - private static final ModuleIdentifier APACHE_HTTPCOMPONENTS = ModuleIdentifier.create("org.apache.httpcomponents"); + private static final ModuleIdentifier KEYCLOAK_CORE = ModuleIdentifier.create("org.keycloak.keycloak-core"); + //private static final ModuleIdentifier APACHE_HTTPCOMPONENTS = ModuleIdentifier.create("org.apache.httpcomponents"); @Override public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); - KeycloakAdapterConfigService service = KeycloakAdapterConfigService.find(phaseContext.getServiceRegistry()); - if (service.isKeycloakDeployment(deploymentUnit.getName())) { - addModules(deploymentUnit); - } + addModules(deploymentUnit); } private void addModules(DeploymentUnit deploymentUnit) { @@ -54,7 +52,8 @@ public class KeycloakDependencyProcessor implements DeploymentUnitProcessor { moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_AS7_ADAPTER, false, false, true, false)); moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_CORE_ADAPTER, false, false, false, false)); - moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, APACHE_HTTPCOMPONENTS, false, false, true, false)); + moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_CORE, false, false, false, false)); + //moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, APACHE_HTTPCOMPONENTS, false, false, true, false)); } @Override diff --git a/integration/as7-eap6/adapter/src/main/java/org/keycloak/adapters/as7/KeycloakAuthenticatorValve.java b/integration/as7-eap6/adapter/src/main/java/org/keycloak/adapters/as7/KeycloakAuthenticatorValve.java index 7c3704f4dd..58bc6c97f9 100755 --- a/integration/as7-eap6/adapter/src/main/java/org/keycloak/adapters/as7/KeycloakAuthenticatorValve.java +++ b/integration/as7-eap6/adapter/src/main/java/org/keycloak/adapters/as7/KeycloakAuthenticatorValve.java @@ -175,7 +175,8 @@ public class KeycloakAuthenticatorValve extends FormAuthenticator implements Lif } protected boolean bearer(boolean challenge, Request request, HttpServletResponse response) throws LoginException, IOException { - CatalinaBearerTokenAuthenticator bearer = new CatalinaBearerTokenAuthenticator(realmConfiguration.getMetadata(), challenge, adapterConfig.isUseResourceRoleMappings()); + boolean useResourceRoleMappings = adapterConfig.isUseResourceRoleMappings(); + CatalinaBearerTokenAuthenticator bearer = new CatalinaBearerTokenAuthenticator(resourceMetadata, challenge, useResourceRoleMappings); if (bearer.login(request, response)) { return true; } diff --git a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/OAuthAuthenticator.java b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/OAuthAuthenticator.java index 9c2936c3b1..74c614e6a0 100755 --- a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/OAuthAuthenticator.java +++ b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/OAuthAuthenticator.java @@ -244,7 +244,7 @@ public class OAuthAuthenticator { return challenge(StatusCodes.FORBIDDEN); } catch (IOException e) { - log.error("failed to turn code into token"); + log.error("failed to turn code into token", e); return challenge(StatusCodes.FORBIDDEN); } diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java old mode 100644 new mode 100755 index eb885b02c9..d16645d738 --- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java +++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java @@ -24,9 +24,11 @@ import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.DeploymentUnitProcessor; import org.jboss.as.server.deployment.module.ModuleDependency; import org.jboss.as.server.deployment.module.ModuleSpecification; +import org.jboss.logging.Logger; import org.jboss.modules.Module; import org.jboss.modules.ModuleIdentifier; import org.jboss.modules.ModuleLoader; +import org.keycloak.subsystem.logging.KeycloakLogger; /** * @@ -36,16 +38,13 @@ public class KeycloakDependencyProcessor implements DeploymentUnitProcessor { private static final ModuleIdentifier KEYCLOAK_UNDERTOW_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-undertow-adapter"); private static final ModuleIdentifier KEYCLOAK_CORE_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-adapter-core"); - private static final ModuleIdentifier APACHE_HTTPCOMPONENTS = ModuleIdentifier.create("org.apache.httpcomponents"); + private static final ModuleIdentifier KEYCLOAK_CORE = ModuleIdentifier.create("org.keycloak.keycloak-core"); + //private static final ModuleIdentifier APACHE_HTTPCOMPONENTS = ModuleIdentifier.create("org.apache.httpcomponents"); @Override public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); - - KeycloakAdapterConfigService service = KeycloakAdapterConfigService.find(phaseContext.getServiceRegistry()); - if (service.isKeycloakDeployment(deploymentUnit.getName())) { - addModules(deploymentUnit); - } + addModules(deploymentUnit); } private void addModules(DeploymentUnit deploymentUnit) { @@ -54,7 +53,8 @@ public class KeycloakDependencyProcessor implements DeploymentUnitProcessor { moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_UNDERTOW_ADAPTER, false, false, true, false)); moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_CORE_ADAPTER, false, false, false, false)); - moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, APACHE_HTTPCOMPONENTS, false, false, true, false)); + moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_CORE, false, false, false, false)); + //moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, APACHE_HTTPCOMPONENTS, false, false, true, false)); } @Override diff --git a/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml index 87755b6ef0..f37138daeb 100755 --- a/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml +++ b/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -2,6 +2,12 @@ + + + + + +