From f0d3fa783a98c78dd21ff9a48af9fc06be1fa4c5 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Fri, 24 Apr 2015 07:15:11 +0200
Subject: [PATCH 1/3] Moved docs into separate dist to reduce size of
 server-overlay

---
 distribution/docs-dist/assembly.xml           |  33 +++++
 distribution/docs-dist/build.xml              | 122 ++++++++++++++++++
 distribution/docs-dist/pom.xml                |  55 ++++++++
 .../src}/index.html                           |   0
 distribution/examples-dist/assembly.xml       |   1 +
 distribution/proxy-dist/assembly.xml          |  11 ++
 distribution/server-bundle-dist/assembly.xml  |   8 ++
 distribution/server-bundle-dist/pom.xml       |   5 +
 distribution/server-overlay/assembly.xml      |  18 +--
 distribution/server-overlay/pom.xml           |   2 +-
 10 files changed, 237 insertions(+), 18 deletions(-)
 create mode 100755 distribution/docs-dist/assembly.xml
 create mode 100755 distribution/docs-dist/build.xml
 create mode 100755 distribution/docs-dist/pom.xml
 rename distribution/{examples-dist => docs-dist/src}/index.html (100%)

diff --git a/distribution/docs-dist/assembly.xml b/distribution/docs-dist/assembly.xml
new file mode 100755
index 0000000000..fa4b1b37cf
--- /dev/null
+++ b/distribution/docs-dist/assembly.xml
@@ -0,0 +1,33 @@
+<assembly>
+    <id>docs-dist</id>
+
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>../../target/site/apidocs</directory>
+            <outputDirectory>javadocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../../services/target/apidocs</directory>
+            <outputDirectory>rest-api</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../../docbook/target/docbook/publish/en-US</directory>
+            <outputDirectory>userguide</outputDirectory>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>src/index.html</source>
+            <outputDirectory></outputDirectory>
+        </file>
+    </files>
+
+</assembly>
diff --git a/distribution/docs-dist/build.xml b/distribution/docs-dist/build.xml
new file mode 100755
index 0000000000..96fce2314a
--- /dev/null
+++ b/distribution/docs-dist/build.xml
@@ -0,0 +1,122 @@
+<project name="example-dist" basedir="." default="all">
+
+    <target name="all">
+        <delete dir="target/examples"/>
+        <copy todir="target/examples/cors" overwrite="true">
+            <fileset dir="../../examples/cors">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/cordova" overwrite="true">
+            <fileset dir="../../examples/cordova">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/providers" overwrite="true">
+            <fileset dir="../../examples/providers">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/saml" overwrite="true">
+            <fileset dir="../../examples/saml">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/broker/saml-broker-authentication" overwrite="true">
+            <fileset dir="../../examples/broker/saml-broker-authentication">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/js-console" overwrite="true">
+            <fileset dir="../../examples/js-console">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/multi-tenant" overwrite="true">
+            <fileset dir="../../examples/multi-tenant">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/basic-auth" overwrite="true">
+            <fileset dir="../../examples/basic-auth">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/admin-client" overwrite="true">
+            <fileset dir="../../examples/admin-client">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/themes" overwrite="true">
+            <fileset dir="../../examples/themes">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/preconfigured-demo" overwrite="true">
+            <fileset dir="../../examples/demo-template">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/unconfigured-demo" overwrite="true">
+            <fileset dir="../../examples/demo-template">
+                <exclude name="**/*.wildfly"/>
+                <exclude name="**/*.as7"/>
+                <exclude name="**/WEB-INF/jboss-web.xml"/>
+                <exclude name="**/keycloak.json"/>
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/README.md"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/fuse" overwrite="true">
+            <fileset dir="../../examples/fuse">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/kerberos" overwrite="true">
+            <fileset dir="../../examples/kerberos">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+            </fileset>
+        </copy>
+        <copy file="../../examples/README.md" tofile="target/examples/README.md"/>
+        <move file="target/examples/unconfigured-demo/README.md.unconfigured" tofile="target/examples/unconfigured-demo/README.md"/>
+        <move file="target/examples/unconfigured-demo/customer-app/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/customer-app/src/main/webapp/WEB-INF/web.xml"/>
+        <move file="target/examples/unconfigured-demo/product-app/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/product-app/src/main/webapp/WEB-INF/web.xml"/>
+        <move file="target/examples/unconfigured-demo/database-service/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/database-service/src/main/webapp/WEB-INF/web.xml"/>
+    </target>
+</project>
diff --git a/distribution/docs-dist/pom.xml b/distribution/docs-dist/pom.xml
new file mode 100755
index 0000000000..49f076a3ce
--- /dev/null
+++ b/distribution/docs-dist/pom.xml
@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>1.2.0.RC1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>keycloak-docs-dist</artifactId>
+    <packaging>pom</packaging>
+    <name>Keycloak Docs Distribution</name>
+    <description/>
+
+    <dependencies>
+    </dependencies>
+    <build>
+        <finalName>keycloak-docs-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>assemble</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>assembly.xml</descriptor>
+                            </descriptors>
+                            <outputDirectory>
+                                target
+                            </outputDirectory>
+                            <workDirectory>
+                                target/assembly/work
+                            </workDirectory>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/distribution/examples-dist/index.html b/distribution/docs-dist/src/index.html
similarity index 100%
rename from distribution/examples-dist/index.html
rename to distribution/docs-dist/src/index.html
diff --git a/distribution/examples-dist/assembly.xml b/distribution/examples-dist/assembly.xml
index a8c9ab2207..2d249b122f 100755
--- a/distribution/examples-dist/assembly.xml
+++ b/distribution/examples-dist/assembly.xml
@@ -4,6 +4,7 @@
     <formats>
         <format>zip</format>
     </formats>
+
     <includeBaseDirectory>true</includeBaseDirectory>
 
     <fileSets>
diff --git a/distribution/proxy-dist/assembly.xml b/distribution/proxy-dist/assembly.xml
index 98956797ea..89ba584249 100755
--- a/distribution/proxy-dist/assembly.xml
+++ b/distribution/proxy-dist/assembly.xml
@@ -4,8 +4,19 @@
     <formats>
         <format>zip</format>
     </formats>
+
     <includeBaseDirectory>true</includeBaseDirectory>
 
+    <fileSets>
+        <fileSet>
+            <directory>../../</directory>
+            <includes>
+                <include>License.html</include>
+            </includes>
+            <outputDirectory></outputDirectory>
+        </fileSet>
+    </fileSets>
+
     <dependencySets>
         <dependencySet>
             <unpack>false</unpack>
diff --git a/distribution/server-bundle-dist/assembly.xml b/distribution/server-bundle-dist/assembly.xml
index 1b4b99432e..49835001c2 100755
--- a/distribution/server-bundle-dist/assembly.xml
+++ b/distribution/server-bundle-dist/assembly.xml
@@ -6,6 +6,7 @@
         <format>tar.gz</format>
         <format>dir</format>
     </formats>
+
     <includeBaseDirectory>true</includeBaseDirectory>
 
     <dependencySets>
@@ -23,5 +24,12 @@
             <outputDirectory></outputDirectory>
             <unpack>true</unpack>
         </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.keycloak:keycloak-docs-dist:zip</include>
+            </includes>
+            <outputDirectory></outputDirectory>
+            <unpack>true</unpack>
+        </dependencySet>
     </dependencySets>
 </assembly>
diff --git a/distribution/server-bundle-dist/pom.xml b/distribution/server-bundle-dist/pom.xml
index 0328d1c0ad..dc38e481ec 100755
--- a/distribution/server-bundle-dist/pom.xml
+++ b/distribution/server-bundle-dist/pom.xml
@@ -24,6 +24,11 @@
             <artifactId>keycloak-examples-dist</artifactId>
             <type>zip</type>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-docs-dist</artifactId>
+            <type>zip</type>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index 8764a7d3ba..b0bfb1ad37 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -12,13 +12,9 @@
             <directory>${project.build.directory}/unpacked/wildfly-${wildfly.version}</directory>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>**/standalone*.xml</include>
+                <include>standalone/configuration/standalone*.xml</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/unpacked/docs</directory>
-            <outputDirectory>docs</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>${project.build.directory}/unpacked/modules</directory>
             <outputDirectory>modules/system/layers/base</outputDirectory>
@@ -37,18 +33,6 @@
             </includes>
             <outputDirectory></outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>../../target/site/apidocs</directory>
-            <outputDirectory>docs/javadocs</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../services/target/apidocs</directory>
-            <outputDirectory>docs/rest-api</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../docbook/target/docbook/publish/en-US</directory>
-            <outputDirectory>docs/userguide</outputDirectory>
-        </fileSet>
     </fileSets>
 
     <files>
diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index a4ef9a04bc..97eb803a51 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*.xml</includes>
+                            <includes>*/standalone/configuration/standalone*.xml</includes>
                         </configuration>
                     </execution>
                     <execution>

From ac49ba2f44d80b19d06786aab759529f0172ca70 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Fri, 24 Apr 2015 07:30:59 +0200
Subject: [PATCH 2/3] More tweaks to dist

---
 .../assembly.xml                               |  3 +--
 .../{server-bundle-dist => demo-dist}/pom.xml  |  6 +++---
 .../src/main/providers/README.txt              |  0
 .../src/main/themes/README.txt                 |  0
 .../src/main/welcome-content/index.html        |  0
 .../src/main/xslt/standalone.xsl               |  0
 distribution/pom.xml                           | 12 ++++++++----
 distribution/server-dist/assembly.xml          | 11 +++++++++++
 distribution/server-overlay/assembly.xml       | 12 +++++-------
 distribution/subsystem-war/pom.xml             |  3 ---
 pom.xml                                        | 18 ++++++++++++++++++
 11 files changed, 46 insertions(+), 19 deletions(-)
 rename distribution/{server-bundle-dist => demo-dist}/assembly.xml (90%)
 rename distribution/{server-bundle-dist => demo-dist}/pom.xml (90%)
 rename distribution/{server-bundle-dist => demo-dist}/src/main/providers/README.txt (100%)
 rename distribution/{server-bundle-dist => demo-dist}/src/main/themes/README.txt (100%)
 rename distribution/{server-bundle-dist => demo-dist}/src/main/welcome-content/index.html (100%)
 rename distribution/{server-bundle-dist => demo-dist}/src/main/xslt/standalone.xsl (100%)

diff --git a/distribution/server-bundle-dist/assembly.xml b/distribution/demo-dist/assembly.xml
similarity index 90%
rename from distribution/server-bundle-dist/assembly.xml
rename to distribution/demo-dist/assembly.xml
index 49835001c2..1b59337ac8 100755
--- a/distribution/server-bundle-dist/assembly.xml
+++ b/distribution/demo-dist/assembly.xml
@@ -1,10 +1,9 @@
 <assembly>
-    <id>server-bundle-dist</id>
+    <id>demo-dist</id>
 
     <formats>
         <format>zip</format>
         <format>tar.gz</format>
-        <format>dir</format>
     </formats>
 
     <includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distribution/server-bundle-dist/pom.xml b/distribution/demo-dist/pom.xml
similarity index 90%
rename from distribution/server-bundle-dist/pom.xml
rename to distribution/demo-dist/pom.xml
index dc38e481ec..e77212c9f9 100755
--- a/distribution/server-bundle-dist/pom.xml
+++ b/distribution/demo-dist/pom.xml
@@ -8,9 +8,9 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>keycloak-server-bundle-dist</artifactId>
+    <artifactId>keycloak-demo-dist</artifactId>
     <packaging>pom</packaging>
-    <name>Keycloak Server Bundle Distribution</name>
+    <name>Keycloak Demo Distribution</name>
     <description/>
 
     <dependencies>
@@ -32,7 +32,7 @@
     </dependencies>
 
     <build>
-        <finalName>keycloak-${project.version}</finalName>
+        <finalName>keycloak-demo-${project.version}</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
diff --git a/distribution/server-bundle-dist/src/main/providers/README.txt b/distribution/demo-dist/src/main/providers/README.txt
similarity index 100%
rename from distribution/server-bundle-dist/src/main/providers/README.txt
rename to distribution/demo-dist/src/main/providers/README.txt
diff --git a/distribution/server-bundle-dist/src/main/themes/README.txt b/distribution/demo-dist/src/main/themes/README.txt
similarity index 100%
rename from distribution/server-bundle-dist/src/main/themes/README.txt
rename to distribution/demo-dist/src/main/themes/README.txt
diff --git a/distribution/server-bundle-dist/src/main/welcome-content/index.html b/distribution/demo-dist/src/main/welcome-content/index.html
similarity index 100%
rename from distribution/server-bundle-dist/src/main/welcome-content/index.html
rename to distribution/demo-dist/src/main/welcome-content/index.html
diff --git a/distribution/server-bundle-dist/src/main/xslt/standalone.xsl b/distribution/demo-dist/src/main/xslt/standalone.xsl
similarity index 100%
rename from distribution/server-bundle-dist/src/main/xslt/standalone.xsl
rename to distribution/demo-dist/src/main/xslt/standalone.xsl
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 16cc9bee0c..d16e3b1257 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 8cbea2dc7b..9aca8d8621 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>
@@ -26,6 +27,13 @@
             </includes>
             <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>
@@ -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 b0bfb1ad37..26f4d8cf42 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -8,13 +8,6 @@
     <includeBaseDirectory>false</includeBaseDirectory>
 
     <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>
@@ -36,6 +29,11 @@
     </fileSets>
 
     <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>
diff --git a/distribution/subsystem-war/pom.xml b/distribution/subsystem-war/pom.xml
index dcaa848f5e..a86119090d 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 c0985079f3..4e0ff26cf4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -920,6 +920,24 @@
                 <version>${project.version}</version>
                 <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>

From 1f49ae8a2f827774cd69773061af10e7a389dd44 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Fri, 24 Apr 2015 09:19:40 +0200
Subject: [PATCH 3/3] Updated xslts

---
 distribution/server-dist/assembly.xml         | 18 +++---
 distribution/server-dist/pom.xml              | 26 ++++++++
 .../server-dist/src/main/xslt/standalone.xsl  | 61 +++++++++++++++++++
 distribution/server-overlay/pom.xml           |  4 +-
 .../src/main/xslt/standalone.xsl              | 37 +++--------
 5 files changed, 106 insertions(+), 40 deletions(-)
 create mode 100755 distribution/server-dist/src/main/xslt/standalone.xsl

diff --git a/distribution/server-dist/assembly.xml b/distribution/server-dist/assembly.xml
index 9aca8d8621..bc972b15d9 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>
@@ -27,13 +28,6 @@
             </includes>
             <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>
@@ -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 9eacd09fae..c61330f3ce 100755
--- a/distribution/server-dist/pom.xml
+++ b/distribution/server-dist/pom.xml
@@ -53,6 +53,32 @@
                     </execution>
                 </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>
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 0000000000..697ebb4803
--- /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 97eb803a51..c2b5f21a8f 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 8973a4d71a..0180557725 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()" />