keycloak-aplcache

diff --git a/distribution/eap6-server-dist/assembly.xml b/distribution/eap6-server-dist/assembly.xml
new file mode 100755
index 0000000..e86c8ee
--- /dev/null
+++ b/distribution/eap6-server-dist/assembly.xml
@@ -0,0 +1,36 @@
+<assembly>
+    <id>eap6-server-dist</id>
+
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}/unpacked/jboss-eap-6.4</directory>
+            <outputDirectory>jboss-iam-1.0</outputDirectory>
+            <excludes>
+                <exclude>standalone/configuration/standalone.xml</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/unpacked/overlay</directory>
+            <outputDirectory>jboss-iam-1.0</outputDirectory>
+            <excludes>
+                <exclude>standalone/configuration/standalone-keycloak.xml</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>${project.build.directory}/unpacked/overlay/standalone/configuration/standalone-keycloak.xml</source>
+            <outputDirectory>jboss-iam-1.0/standalone/configuration</outputDirectory>
+            <destName>standalone.xml</destName>
+        </file>
+    </files>
+
+</assembly>

diff --git a/distribution/eap6-server-dist/pom.xml b/distribution/eap6-server-dist/pom.xml
new file mode 100755
index 0000000..012b5f9
--- /dev/null
+++ b/distribution/eap6-server-dist/pom.xml
@@ -0,0 +1,89 @@
+<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.7.0.Final</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>keycloak-eap6-server-dist</artifactId>
+    <packaging>pom</packaging>
+    <name>Keycloak EAP 6 Server Distribution</name>
+    <description/>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-server-overlay-eap6</artifactId>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.as</groupId>
+            <artifactId>jboss-as-dist</artifactId>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>keycloak-eap6-server-dist-${project.version}</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-server-overlay</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.keycloak</groupId>
+                                    <artifactId>keycloak-server-overlay-eap6</artifactId>
+                                    <type>zip</type>
+                                    <outputDirectory>${project.build.directory}/unpacked/overlay</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.jboss.as</groupId>
+                                    <artifactId>jboss-as-dist</artifactId>
+                                    <type>zip</type>
+                                    <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <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>
+                            <recompressZippedFiles>true</recompressZippedFiles>
+                            <finalName>${project.build.finalName}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <workDirectory>${project.build.directory}/assembly/work</workDirectory>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 626716b..1b94424 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -19,6 +19,7 @@
         <module>saml-adapters</module>
         <!--<module>demo-dist</module>-->
         <!--<module>docs-dist</module>-->
+        <module>eap6-server-dist</module>
         <module>examples-dist</module>
         <!--<module>proxy-dist</module>-->
         <!--<module>server-dist</module>-->

diff --git a/pom.xml b/pom.xml
index ea3b912..482e772 100755
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <wildfly.build-tools.version>1.0.0.Final</wildfly.build-tools.version>
 
         <!-- this is EAP 6.4 alpha, publicly available -->
-        <jboss.version>7.5.0.Final-redhat-15</jboss.version>
+        <jboss.version>7.5.4.Final-redhat-4</jboss.version>
 
         <!--<servlet.api.30.version>1.0.2.Final</servlet.api.30.version>-->
         <google.zxing.version>3.2.1.redhat-2</google.zxing.version>
@@ -173,10 +173,16 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>eap6-supported-artifacts</artifactId>
-                <version>6.4.0.GA</version>
+                <version>6.4.4.GA</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.as</groupId>
+                <artifactId>jboss-as-dist</artifactId>
+                <version>${jboss.version}</version>
+                <type>zip</type>
+            </dependency>
             <!--<dependency>
                 <groupId>com.github.relaxng</groupId>
                 <artifactId>relaxngDatatype</artifactId>