keycloak-uncached

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 16cc9be..d16e3b1 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -6,6 +6,7 @@
         <version>1.2.0.RC1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+
     <name>Distribution Parent</name>
     <description/>
     <modelVersion>4.0.0</modelVersion>
@@ -24,14 +25,17 @@
             </plugin>
         </plugins>
     </build>
+
     <modules>
         <module>adapters</module>
-        <module>subsystem-war</module>
-        <module>modules</module>
+        <module>demo-dist</module>
+        <module>docs-dist</module>
         <module>examples-dist</module>
+        <module>modules</module>
         <module>proxy-dist</module>
-        <module>src-dist</module>
-        <module>server-overlay</module>
         <module>server-dist</module>
+        <module>server-overlay</module>
+        <module>src-dist</module>
+        <module>subsystem-war</module>
     </modules>
 </project>

diff --git a/distribution/server-dist/assembly.xml b/distribution/server-dist/assembly.xml
index 8cbea2d..9aca8d8 100755
--- a/distribution/server-dist/assembly.xml
+++ b/distribution/server-dist/assembly.xml
@@ -16,6 +16,7 @@
                 <exclude>**/*.sh</exclude>
                 <exclude>welcome-content/**</exclude>
                 <exclude>docs/**</exclude>
+                <exclude>standalone/configuration/standalone*.xml</exclude>
             </excludes>
         </fileSet>
         <fileSet>
@@ -27,6 +28,13 @@
             <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>
@@ -41,6 +49,9 @@
                 <include>org.keycloak:keycloak-server-overlay:zip</include>
             </includes>
             <outputDirectory></outputDirectory>
+            <excludes>
+                <exclude>standalone/configuration/standalone-keycloak.xml</exclude>
+            </excludes>
             <unpack>true</unpack>
         </dependencySet>
     </dependencySets>

diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index b0bfb1a..26f4d8c 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -9,13 +9,6 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/unpacked/wildfly-${wildfly.version}</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>standalone/configuration/standalone*.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
             <directory>${project.build.directory}/unpacked/modules</directory>
             <outputDirectory>modules/system/layers/base</outputDirectory>
         </fileSet>
@@ -37,6 +30,11 @@
 
     <files>
         <file>
+            <source>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration/standalone.xml</source>
+            <outputDirectory>standalone/configuration</outputDirectory>
+            <destName>standalone-keycloak.xml</destName>
+        </file>
+        <file>
             <source>../subsystem-war/src/main/resources/META-INF/keycloak-server.json</source>
             <outputDirectory>standalone/configuration</outputDirectory>
         </file>

diff --git a/distribution/subsystem-war/pom.xml b/distribution/subsystem-war/pom.xml
index dcaa848..a861190 100755
--- a/distribution/subsystem-war/pom.xml
+++ b/distribution/subsystem-war/pom.xml
@@ -15,9 +15,6 @@
     <name>Keycloak Subsystem Server WAR</name>
     <description/>
 
-    <dependencies>
-    </dependencies>
-
     <build>
         <finalName>auth-server</finalName>
         <plugins>

diff --git a/pom.xml b/pom.xml
index c098507..4e0ff26 100755
--- a/pom.xml
+++ b/pom.xml
@@ -921,6 +921,24 @@
                 <type>zip</type>
             </dependency>
             <dependency>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-server-dist</artifactId>
+                <version>${project.version}</version>
+                <type>zip</type>
+            </dependency>
+            <dependency>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-docs-dist</artifactId>
+                <version>${project.version}</version>
+                <type>zip</type>
+            </dependency>
+            <dependency>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-examples-dist</artifactId>
+                <version>${project.version}</version>
+                <type>zip</type>
+            </dependency>
+            <dependency>
                 <groupId>org.keycloak.subsystem</groupId>
                 <artifactId>keycloak-server</artifactId>
                 <version>${project.version}</version>