keycloak-uncached

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/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/pom.xml b/integration/pom.xml
index e19b953..399175b 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -23,7 +23,7 @@
         <module>jetty</module>
         <module>undertow</module>
         <module>wildfly-adapter</module>
-        <module>wildfly-subsystem</module>
+        <module>keycloak-subsystem</module>
         <module>js</module>
         <module>installed</module>
         <module>admin-client</module>