keycloak-memoizeit

diff --git a/distribution/appliance-dist/src/main/xslt/standalone.xsl b/distribution/appliance-dist/src/main/xslt/standalone.xsl
index 3cb32a9..8973a4d 100755
--- a/distribution/appliance-dist/src/main/xslt/standalone.xsl
+++ b/distribution/appliance-dist/src/main/xslt/standalone.xsl
@@ -12,7 +12,7 @@
     <xsl:template match="node()[name(.)='extensions']">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*"/>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
         </xsl:copy>
     </xsl:template>
 

diff --git a/distribution/as7-adapter-zip/assembly.xml b/distribution/as7-adapter-zip/assembly.xml
index 120549a..b9289c4 100755
--- a/distribution/as7-adapter-zip/assembly.xml
+++ b/distribution/as7-adapter-zip/assembly.xml
@@ -12,7 +12,7 @@
             <excludes>
                 <exclude>org/picketlink/**</exclude>
                 <exclude>org/keycloak/keycloak-undertow-adapter/**</exclude>
-                <exclude>org/keycloak/keycloak-wildfly-subsystem/**</exclude>
+                <exclude>org/keycloak/keycloak-subsystem/**</exclude>
                 <exclude>org/keycloak/keycloak-wildfly-adapter/**</exclude>
             </excludes>
             <outputDirectory>modules</outputDirectory>

diff --git a/distribution/eap6-adapter-zip/assembly.xml b/distribution/eap6-adapter-zip/assembly.xml
index d3ac9a4..5e104ac 100755
--- a/distribution/eap6-adapter-zip/assembly.xml
+++ b/distribution/eap6-adapter-zip/assembly.xml
@@ -12,7 +12,7 @@
             <excludes>
                 <exclude>org/picketlink/**</exclude>
                 <exclude>org/keycloak/keycloak-undertow-adapter/**</exclude>
-                <exclude>org/keycloak/keycloak-wildfly-subsystem/**</exclude>
+                <exclude>org/keycloak/keycloak-subsystem/**</exclude>
                 <exclude>org/keycloak/keycloak-wildfly-adapter/**</exclude>
             </excludes>
             <outputDirectory>modules/system/layers/base</outputDirectory>

diff --git a/distribution/modules/build.xml b/distribution/modules/build.xml
index 7ea8576..14ed2cd 100755
--- a/distribution/modules/build.xml
+++ b/distribution/modules/build.xml
@@ -83,8 +83,8 @@
             <maven-resource group="org.keycloak" artifact="keycloak-wildfly-adapter"/>
         </module-def>
 
-        <module-def name="org.keycloak.keycloak-wildfly-subsystem">
-            <maven-resource group="org.keycloak" artifact="keycloak-wildfly-subsystem"/>
+        <module-def name="org.keycloak.keycloak-subsystem">
+            <maven-resource group="org.keycloak" artifact="keycloak-subsystem"/>
         </module-def>
         <module-def name="org.keycloak.keycloak-as7-subsystem">
             <maven-resource group="org.keycloak" artifact="keycloak-as7-subsystem"/>

diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml
index 5a3dbb0..5a286ab 100755
--- a/distribution/modules/pom.xml
+++ b/distribution/modules/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-wildfly-subsystem</artifactId>
+            <artifactId>keycloak-subsystem</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -214,7 +214,7 @@
                                     <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/modules/org/keycloak/keycloak-wildfly-subsystem/main/auth-server</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/modules/org/keycloak/keycloak-subsystem/main/auth-server</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>

diff --git a/docbook/reference/en/en-US/modules/jboss-adapter.xml b/docbook/reference/en/en-US/modules/jboss-adapter.xml
index 795b74f..a172ab0 100755
--- a/docbook/reference/en/en-US/modules/jboss-adapter.xml
+++ b/docbook/reference/en/en-US/modules/jboss-adapter.xml
@@ -41,12 +41,12 @@ $ unzip keycloak-as7-adapter-dist.zip
         After adding the Keycloak modules, you must then enable the Keycloak Subsystem within your app server's server configuration:
         <literal>domain.xml</literal> or <literal>standalone.xml</literal>.
     </para>
-    <para>For Wildfly:
+    <para>
 <programlisting><![CDATA[
 <server xmlns="urn:jboss:domain:1.4">
 
     <extensions>
-        <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+        <extension module="org.keycloak.keycloak-subsystem"/>
           ...
     </extensions>
 
@@ -57,24 +57,8 @@ $ unzip keycloak-as7-adapter-dist.zip
 ]]>
 </programlisting>
     </para>
-    <para>For JBoss AS 7.1.1 and EAP 6.x:
-<programlisting><![CDATA[
-<server xmlns="urn:jboss:domain:1.4">
-
-    <extensions>
-        <extension module="org.keycloak.keycloak-as7-subsystem"/>
-         ...
-    </extensions>
-
-    <profile>
-        <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-          ...
-    </profile>
-]]>
-</programlisting>
-    </para>
         <para>
-            Finally, for both AS7, EAP 6.x, and Wildfly installations you must specify a shared keycloak security domain.
+            Finally, you must specify a shared keycloak security domain.
             This security domain should be used with EJBs and other components when you need the security context created
             in the secured web tier to be propagated to the EJBs (other EE component) you are invoking.  Otherwise
             this configuration is optional.

diff --git a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
index 3e05860..2e40ef4 100755
--- a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
+++ b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
@@ -86,6 +86,8 @@
                 From the 'tomcat7' package to just 'tomcat'.
                 </listitem>
                 <listitem>JavaScript adapter now has idToken and idTokenParsed properties. If you use idToken to retrieve first name, email, etc. you need to change this to idTokenParsed.</listitem>
+                <listitem>The as7-eap-subsystem and keycloak-wildfly-subsystem have been merged into one keycloak-subsystem.  If you have an existing standalone.xml
+                          or domain.xml, you will need edit near the top of the file and change the extension module name to org.keycloak.keycloak-subsystem</listitem>
             </itemizedlist>
         </section>
         <section>

diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml
index 360f57e..d81d16c 100755
--- a/docbook/reference/en/en-US/modules/server-installation.xml
+++ b/docbook/reference/en/en-US/modules/server-installation.xml
@@ -124,14 +124,6 @@ keycloak-war-dist-all-&project.version;/
             If you have Keycloak on JBoss AS 7.1.1 <link linkend="as7-specifics">these steps</link>.
         </para>
     </section>
-    <section id="subsystem_installation">
-        <title>Subsystem Installation</title>
-        <para>
-            For WildFly installations, the Keycloak server is not deployed from the /deployments directory.  Instead, the Keycloak 
-            subsystem module contains the Keycloak server and it is controlled by the subsystem.  If you are using the 
-            appliance install, this subsystem is already present and a Keycloak server is pre-defined in the subsytem declaration.
-        </para>
-    </section>
     <section>
         <title id="configure-server">Configuring the Server</title>
         <para>
@@ -760,7 +752,7 @@ keycloak-war-dist-all-&project.version;/
     <section>
         <title>Configuring Servers from the Subsystem</title>
         <para>
-            If you are using WildFly, the Keycloak server is deployed and configured from the Keycloak subsystem.  This makes provisioning simpler in a domain environment.
+            If you are using WildFly or EAP,he Keycloak server is deployed and configured from the Keycloak subsystem.  This makes provisioning simpler in a domain environment.
             It also allows you to create more than one Keycloak server instance inside a single WildFly instance.  And, you can upload providers, themes, and
             server configurations without disturbing Keycloak's auth-server.war.
         </para>
@@ -841,7 +833,7 @@ The Keycloak server will be immediately deployed or undeployed, but not deleted.
             <section id="uploading-extra-config">
                 <title>Uploading extra configuration using CLI</title>
                 <para>
-                    The WildFly Keycloak subsystem allows you to upload keycloak-server.json, provider jars, and theme jars to a Keycloak server instance.  The
+                    The Keycloak subsystem allows you to upload keycloak-server.json, provider jars, and theme jars to a Keycloak server instance.  The
                     CLI operations for this are "update-server-config" and "add-provider".  You may use CLI, CLI GUI, or CLI scripts for these operations.  The following
                     examples are shown using <ulink url="https://developer.jboss.org/wiki/AGUIForTheCommandLineInterface">CLI GUI</ulink> for clarity.
                 </para>

diff --git a/examples/demo-template/README.md b/examples/demo-template/README.md
index 61ab2fb..824b1a9 100755
--- a/examples/demo-template/README.md
+++ b/examples/demo-template/README.md
@@ -57,26 +57,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
-
-For JBoss 7.1.1 and EAP 6.x:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 
@@ -85,7 +69,6 @@ For JBoss 7.1.1 and EAP 6.x:
             ...
         </profile>
 
-
 Step 2: Boot Keycloak Server
 ---------------------------------------
 Where you go to start up the Keycloak Server depends on which distro you installed.

diff --git a/examples/demo-template/README.md.unconfigured b/examples/demo-template/README.md.unconfigured
index 7fc0cc5..73279e0 100755
--- a/examples/demo-template/README.md.unconfigured
+++ b/examples/demo-template/README.md.unconfigured
@@ -37,7 +37,7 @@ Next configure the Keycloak adapter by editing `standalone/configuration/standal
 
     <extensions>
         ....
-        <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+        <extension module="org.keycloak.keycloak-subsystem"/>
     </extensions>
 
 You also need to add realm config to the same file. Add a new child-element to `<profile>`:

diff --git a/examples/saml/post-basic/README.md b/examples/saml/post-basic/README.md
index 70934a7..951af23 100755
--- a/examples/saml/post-basic/README.md
+++ b/examples/saml/post-basic/README.md
@@ -45,26 +45,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
-
-For JBoss 7.1.1 and EAP 6.x:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 
@@ -73,7 +57,6 @@ For JBoss 7.1.1 and EAP 6.x:
             ...
         </profile>
 
-
 Boot Keycloak Server
 ---------------------------------------
 Where you go to start up the Keycloak Server depends on which distro you installed.

diff --git a/examples/saml/post-with-encryption/README.md b/examples/saml/post-with-encryption/README.md
index 0888515..10be6c6 100755
--- a/examples/saml/post-with-encryption/README.md
+++ b/examples/saml/post-with-encryption/README.md
@@ -45,26 +45,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
-
-For JBoss 7.1.1 and EAP 6.x:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 
@@ -73,7 +57,6 @@ For JBoss 7.1.1 and EAP 6.x:
             ...
         </profile>
 
-
 Boot Keycloak Server
 ---------------------------------------
 Where you go to start up the Keycloak Server depends on which distro you installed.

diff --git a/examples/saml/post-with-signature/README.md b/examples/saml/post-with-signature/README.md
index 971e071..6bfd624 100755
--- a/examples/saml/post-with-signature/README.md
+++ b/examples/saml/post-with-signature/README.md
@@ -45,26 +45,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
-
-For JBoss 7.1.1 and EAP 6.x:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 

diff --git a/examples/saml/redirect-basic/README.md b/examples/saml/redirect-basic/README.md
index 9cf014c..dd764b6 100755
--- a/examples/saml/redirect-basic/README.md
+++ b/examples/saml/redirect-basic/README.md
@@ -45,26 +45,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
-
-For JBoss 7.1.1 and EAP 6.x:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 

diff --git a/examples/saml/redirect-with-signature/README.md b/examples/saml/redirect-with-signature/README.md
index 329f554..b185ff9 100755
--- a/examples/saml/redirect-with-signature/README.md
+++ b/examples/saml/redirect-with-signature/README.md
@@ -45,12 +45,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 
@@ -59,19 +57,6 @@ For Wildfly:
             ...
         </profile>
 
-For JBoss 7.1.1 and EAP 6.x:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
 
 
 Boot Keycloak Server

diff --git a/integration/keycloak-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/KeycloakServerDeploymentProcessor.java b/integration/keycloak-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/KeycloakServerDeploymentProcessor.java
new file mode 100644
index 0000000..dd66a01
--- /dev/null
+++ b/integration/keycloak-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/KeycloakServerDeploymentProcessor.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors
+ * as indicated by the @author tags. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.keycloak.subsystem.extension.authserver;
+
+import org.jboss.as.ee.component.EEModuleDescription;
+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.keycloak.subsystem.extension.KeycloakAdapterConfigService;
+
+/**
+ * DUP responsible for setting the web context of a Keycloak auth server.
+ *
+ * @author Stan Silvert ssilvert@redhat.com (C) 2014 Red Hat Inc.
+ */
+public class KeycloakServerDeploymentProcessor implements DeploymentUnitProcessor {
+
+    @Override
+    public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException {
+        DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();
+        String deploymentName = deploymentUnit.getName();
+        KeycloakAdapterConfigService service = KeycloakAdapterConfigService.find(phaseContext.getServiceRegistry());
+        if (!service.isKeycloakServerDeployment(deploymentName)) {
+            return;
+        }
+
+        final EEModuleDescription description = deploymentUnit.getAttachment(org.jboss.as.ee.component.Attachments.EE_MODULE_DESCRIPTION);
+        String webContext = service.getWebContext(deploymentName);
+        if (webContext == null) {
+            throw new DeploymentUnitProcessingException("Can't determine web context/module for Keycloak Auth Server");
+        }
+        description.setModuleName(webContext);
+    }
+
+    @Override
+    public void undeploy(DeploymentUnit du) {
+
+    }
+}

diff --git a/integration/pom.xml b/integration/pom.xml
index 8c3b6a0..399175b 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -23,8 +23,7 @@
         <module>jetty</module>
         <module>undertow</module>
         <module>wildfly-adapter</module>
-        <module>wildfly-subsystem</module>
-        <module>as7-eap-subsystem</module>
+        <module>keycloak-subsystem</module>
         <module>js</module>
         <module>installed</module>
         <module>admin-client</module>

diff --git a/pom.xml b/pom.xml
index 08994f0..223fe93 100755
--- a/pom.xml
+++ b/pom.xml
@@ -483,6 +483,11 @@
                 <version>${wildfly.core.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.wildfly.core</groupId>
+                <artifactId>wildfly-version</artifactId>
+                <version>${wildfly.core.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.wildfly</groupId>
                 <artifactId>wildfly-undertow</artifactId>
                 <version>${wildfly.version}</version>