keycloak-uncached

diff --git a/distribution/server-dist/assembly.xml b/distribution/server-dist/assembly.xml
index 9aca8d8..bc972b1 100755
--- a/distribution/server-dist/assembly.xml
+++ b/distribution/server-dist/assembly.xml
@@ -16,7 +16,8 @@
                 <exclude>**/*.sh</exclude>
                 <exclude>welcome-content/**</exclude>
                 <exclude>docs/**</exclude>
-                <exclude>standalone/configuration/standalone*.xml</exclude>
+                <exclude>standalone/deployments</exclude>
+                <exclude>standalone/deployments/*</exclude>
             </excludes>
         </fileSet>
         <fileSet>
@@ -28,13 +29,6 @@
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>../server-overlay/target/unpacked/wildfly-${wildfly.version}</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>standalone/configuration/standalone*.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
             <directory>src/main/welcome-content</directory>
             <outputDirectory>welcome-content</outputDirectory>
             <includes>
@@ -49,10 +43,12 @@
                 <include>org.keycloak:keycloak-server-overlay:zip</include>
             </includes>
             <outputDirectory></outputDirectory>
-            <excludes>
-                <exclude>standalone/configuration/standalone-keycloak.xml</exclude>
-            </excludes>
             <unpack>true</unpack>
+            <unpackOptions>
+                <excludes>
+                    <exclude>standalone/configuration/standalone-keycloak.xml</exclude>
+                </excludes>
+            </unpackOptions>
         </dependencySet>
     </dependencySets>
 </assembly>

diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml
index 9eacd09..c61330f 100755
--- a/distribution/server-dist/pom.xml
+++ b/distribution/server-dist/pom.xml
@@ -54,6 +54,32 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xml-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>generate-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>transform</goal>
+                        </goals>
+                        <configuration>
+                            <transformationSets>
+                                <transformationSet>
+                                    <dir>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration</dir>
+                                    <stylesheet>src/main/xslt/standalone.xsl</stylesheet>
+                                    <includes>
+                                        <include>standalone*.xml</include>
+                                    </includes>
+                                    <outputDir>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration</outputDir>
+                                </transformationSet>
+                            </transformationSets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>

diff --git a/distribution/server-dist/src/main/xslt/standalone.xsl b/distribution/server-dist/src/main/xslt/standalone.xsl
new file mode 100755
index 0000000..697ebb4
--- /dev/null
+++ b/distribution/server-dist/src/main/xslt/standalone.xsl
@@ -0,0 +1,61 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xalan="http://xml.apache.org/xalan"
+                xmlns:j="urn:jboss:domain:2.2"
+                xmlns:ds="urn:jboss:domain:datasources:2.0"
+                xmlns:dep="urn:jboss:domain:deployment-scanner:2.0"
+                xmlns:k="urn:jboss:domain:keycloak:1.0"
+                version="2.0"
+                exclude-result-prefixes="xalan j ds dep k">
+
+    <xsl:param name="config"/>
+
+    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" standalone="no"/>
+    <xsl:strip-space elements="*"/>
+
+    <xsl:template match="//j:extensions">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="//j:extensions/j:extension[@module='org.jboss.as.deployment-scanner']">
+    </xsl:template>
+
+    <xsl:template match="//j:profile/dep:subsystem">
+    </xsl:template>
+
+    <xsl:template match="//ds:datasources">
+        <xsl:copy>
+            <xsl:apply-templates select="node()[name(.)='datasource']"/>
+            <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
+                <connection-url>jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE</connection-url>
+                <driver>h2</driver>
+                <security>
+                    <user-name>sa</user-name>
+                    <password>sa</password>
+                </security>
+            </datasource>
+            <xsl:apply-templates select="node()[name(.)='drivers']"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="//j:profile">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*"/>
+            <subsystem xmlns="urn:jboss:domain:keycloak:1.0">
+                <auth-server name="main-auth-server">
+                    <enabled>true</enabled>
+                    <web-context>auth</web-context>
+                </auth-server>
+            </subsystem>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()" />
+        </xsl:copy>
+    </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file

diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index 97eb803..c2b5f21 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -48,7 +48,7 @@
                                     <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
-                            <includes>*/standalone/configuration/standalone*.xml</includes>
+                            <includes>*/standalone/configuration/standalone.xml</includes>
                         </configuration>
                     </execution>
                     <execution>
@@ -87,7 +87,7 @@
                                     <dir>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration</dir>
                                     <stylesheet>src/main/xslt/standalone.xsl</stylesheet>
                                     <includes>
-                                        <include>standalone*.xml</include>
+                                        <include>standalone.xml</include>
                                     </includes>
                                     <outputDir>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration</outputDir>
                                 </transformationSet>

diff --git a/distribution/server-overlay/src/main/xslt/standalone.xsl b/distribution/server-overlay/src/main/xslt/standalone.xsl
index 8973a4d..0180557 100755
--- a/distribution/server-overlay/src/main/xslt/standalone.xsl
+++ b/distribution/server-overlay/src/main/xslt/standalone.xsl
@@ -1,22 +1,26 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:j="urn:jboss:domain:1.3"
+                xmlns:j="urn:jboss:domain:2.2"
+                xmlns:ds="urn:jboss:domain:datasources:2.0"
+                xmlns:dep="urn:jboss:domain:deployment-scanner:2.0"
+                xmlns:k="urn:jboss:domain:keycloak:1.0"
+                xmlns:sec="urn:jboss:domain:security:1.2"
                 version="2.0"
-                exclude-result-prefixes="xalan j">
+                exclude-result-prefixes="xalan j ds dep k sec">
 
     <xsl:param name="config"/>
 
     <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" standalone="no"/>
     <xsl:strip-space elements="*"/>
 
-    <xsl:template match="node()[name(.)='extensions']">
+    <xsl:template match="//j:extensions">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*"/>
             <extension module="org.keycloak.keycloak-subsystem"/>
         </xsl:copy>
     </xsl:template>
 
-    <xsl:template match="node()[name(.)='datasources']">
+    <xsl:template match="//ds:datasources">
         <xsl:copy>
             <xsl:apply-templates select="node()[name(.)='datasource']"/>
             <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
@@ -31,7 +35,7 @@
         </xsl:copy>
     </xsl:template>
 
-    <xsl:template match="node()[name(.)='profile']">
+    <xsl:template match="//j:profile">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*"/>
             <subsystem xmlns="urn:jboss:domain:keycloak:1.0">
@@ -43,7 +47,7 @@
         </xsl:copy>
     </xsl:template>
 
-    <xsl:template match="node()[name(.)='security-domains']">
+    <xsl:template match="//sec:security-domains">
         <xsl:copy>
             <xsl:apply-templates select="node()[name(.)='security-domain']"/>
             <security-domain name="keycloak">
@@ -59,27 +63,6 @@
         </xsl:copy>
     </xsl:template>
 
-
-    <!-- for some reason, Wildfly 8 final decided to turn off management-native which means jboss-as-maven-plugin no
-    longer works -->
-    <xsl:template match="node()[name(.)='management-interfaces']">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-            <native-interface security-realm="ManagementRealm">
-                <socket-binding native="management-native"/>
-            </native-interface>
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- for some reason, Wildfly 8 final decided to turn off management-native which means jboss-as-maven-plugin no
-    longer works -->
-    <xsl:template match="node()[name(.)='socket-binding-group']">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-            <socket-binding name="management-native" interface="management" port="9999"/>
-        </xsl:copy>
-    </xsl:template>
-    
     <xsl:template match="@*|node()">
         <xsl:copy>
             <xsl:apply-templates select="@*|node()" />