Disable testsuite

Add IAM module to eap6-server-dist

KPR-144
Localhost:8080 should show IAM/Keycloak product console, not EAP console

broker/core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -45,6 +45,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+	        <groupId>org.jboss.spec.javax.annotation</groupId>
+	        <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

broker/oidc/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

broker/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

broker/saml/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client-registration/api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-client-registration-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

client-registration/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <name>Keycloak Client Registration Parent</name>

common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/http-client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/infinispan/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -27,6 +27,16 @@
             <artifactId>infinispan-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling-river</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 </project>

connections/jpa-liquibase/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.8.0.xml

@@ -117,14 +117,8 @@
 
         <update tableName="CREDENTIAL">
             <column name="ALGORITHM" type="VARCHAR(36)" value="pbkdf2" />
-            <where>TYPE in ('password-history', 'password') AND ALGORITHM = 'HmacSHA1'</where>
+            <where>TYPE in ('password-history', 'password') AND ALGORITHM is 'HmacSHA1'</where>
         </update>
-
-        <!-- Sybase specific hacks -->
-        <modifySql dbms="sybase">
-            <regExpReplace replace=".*(SET DEFAULT NULL)" with="SELECT 1" />
-        </modifySql>
-
     </changeSet>
 
 </databaseChangeLog>

connections/jpa/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/mongo-update/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/mongo/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
     <name>Connections Parent</name>
     <description/>
@@ -16,8 +16,8 @@
         <module>jpa</module>
         <module>jpa-liquibase</module>
         <module>infinispan</module>
-        <module>mongo</module>
-        <module>mongo-update</module>
+        <!--<module>mongo</module>-->
+        <!--<module>mongo-update</module>-->
         <module>http-client</module>
         <module>truststore</module>
     </modules>

connections/truststore/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

dependencies/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

dependencies/server-all/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.8.2.Final</version>
+		<version>1.8.0.CR2</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -120,7 +120,7 @@
         </dependency>
 
         <!-- mongo -->
-        <dependency>
+        <!-- <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-connections-mongo</artifactId>
         </dependency>
@@ -139,7 +139,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-        </dependency>
+        </dependency> -->
 
         <dependency>
             <groupId>org.liquibase</groupId>

dependencies/server-min/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.8.2.Final</version>
+		<version>1.8.0.CR2</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

distribution/adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/as7-eap6-adapter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak AS7 / JBoss EAP 6 Adapter Distros</name>
@@ -15,7 +15,7 @@
 
     <modules>
         <module>as7-modules</module>
-        <module>as7-adapter-zip</module>
+        <!--<module>as7-adapter-zip</module>-->
         <module>eap6-adapter-zip</module>
     </modules>
 </project>

distribution/adapters/jetty81-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/jetty91-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/jetty92-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/js-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/osgi/features/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak OSGI Features</name>

distribution/adapters/osgi/jaas/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak OSGI JAAS Realm Configuration</name>

distribution/adapters/osgi/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak OSGI Integration</name>

distribution/adapters/osgi/thirdparty/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -16,15 +16,15 @@
 
     <modules>
         <module>as7-eap6-adapter</module>
-        <module>jetty81-adapter-zip</module>
-        <module>jetty91-adapter-zip</module>
-        <module>jetty92-adapter-zip</module>
+        <!--<module>jetty81-adapter-zip</module>-->
+        <!--<module>jetty91-adapter-zip</module>-->
+        <!--<module>jetty92-adapter-zip</module>-->
         <module>js-adapter-zip</module>
         <module>osgi</module>
-        <module>tomcat6-adapter-zip</module>
-        <module>tomcat7-adapter-zip</module>
-        <module>tomcat8-adapter-zip</module>
-        <module>wf8-adapter</module>
-        <module>wildfly-adapter</module>
+        <!--<module>tomcat6-adapter-zip</module>-->
+        <!--<module>tomcat7-adapter-zip</module>-->
+        <!--<module>tomcat8-adapter-zip</module>-->
+        <!--<module>wf8-adapter</module>-->
+        <!--<module>wildfly-adapter</module>-->
     </modules>
 </project>

distribution/adapters/tomcat6-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/tomcat7-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/tomcat8-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/wf8-adapter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak Wildfly 8 Adapter</name>

distribution/adapters/wf8-adapter/wf8-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/wf8-adapter/wf8-modules/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/wildfly-adapter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak Wildfly Adapter</name>

distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/wildfly-adapter/wildfly-modules/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/demo-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

distribution/docs-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

distribution/downloads/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.keycloak</groupId>
         <artifactId>distribution-pom</artifactId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <artifactId>keycloak-dist-downloads</artifactId>

distribution/eap6-server-dist/assembly.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ /*
+  ~ * JBoss, Home of Professional Open Source.
+  ~ * Copyright 2014, Red Hat, Inc., and individual contributors
+  ~ * as indicated by the @author tags. See the copyright.txt file in the
+  ~ * distribution for a full listing of individual contributors.
+  ~ *
+  ~ * This is free software; you can redistribute it and/or modify it
+  ~ * under the terms of the GNU Lesser General Public License as
+  ~ * published by the Free Software Foundation; either version 2.1 of
+  ~ * the License, or (at your option) any later version.
+  ~ *
+  ~ * This software is distributed in the hope that it will be useful,
+  ~ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ * Lesser General Public License for more details.
+  ~ *
+  ~ * You should have received a copy of the GNU Lesser General Public
+  ~ * License along with this software; if not, write to the Free
+  ~ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  ~ */
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <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>${product.name}-${product.version}</outputDirectory>
+            <excludes>
+                <exclude>standalone/configuration/standalone.xml</exclude>
+                <exclude>modules/system/layers/base/org/jboss/as/product/**</exclude>
+                <exclude>bin/product.conf</exclude>
+                <exclude>welcome-content/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/unpacked/overlay</directory>
+            <outputDirectory>${product.name}-${product.version}</outputDirectory>
+            <excludes>
+                <exclude>standalone/configuration/standalone-keycloak.xml</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/modules</directory>
+            <outputDirectory>${product.name}-${product.version}/modules</outputDirectory>
+            <filtered>true</filtered>
+            <includes>
+               <include>**/module.xml</include>
+               <include>**/MANIFEST.MF</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/content</directory>
+            <outputDirectory>${product.name}-${product.version}</outputDirectory>
+            <filtered>false</filtered>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/welcome-content</directory>
+            <outputDirectory>${product.name}-${product.version}/welcome-content</outputDirectory>
+            <filtered>false</filtered>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>${project.build.directory}/unpacked/overlay/standalone/configuration/standalone-keycloak.xml</source>
+            <outputDirectory>${product.name}-${product.version}/standalone/configuration</outputDirectory>
+            <destName>standalone.xml</destName>
+        </file>
+    </files>
+
+</assembly>

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.8.0.CR2</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>

distribution/eap6-server-dist/src/main/content/bin/product.conf

@@ -0,0 +1 @@
+slot=iam

distribution/eap6-server-dist/src/main/modules/system/layers/base/org/jboss/as/product/iam/dir/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+JBoss-Product-Release-Name: ${product.name}
+JBoss-Product-Release-Version: ${product.version}
+JBoss-Product-Console-Slot: eap

distribution/eap6-server-dist/src/main/modules/system/layers/base/org/jboss/as/product/iam/module.xml

@@ -1,6 +1,8 @@
-/*
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
   ~ JBoss, Home of Professional Open Source.
-  ~ Copyright (c) 2011, Red Hat, Inc., and individual contributors
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
   ~ as indicated by the @author tags. See the copyright.txt file in the
   ~ distribution for a full listing of individual contributors.
   ~
@@ -18,48 +20,15 @@
   ~ License along with this software; if not, write to the Free
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+  -->
 
-body {
-	/*background: url(bkg.gif) repeat-x;*/
-	color: #5B5B5B;
-	font-family: "Lucida Sans Unicode", "Lucida Grande", Geneva, Verdana, Arial, sans-serif;
-	margin-top: 100px;
-	text-align: center;
-}
-.wrapper {
-	margin-left: auto;
-	margin-right: auto;
-	width: 50em;
-	text-align: left;
-}
-a {
-	text-decoration: none;
-	color: #5e8a9a;
-}
-h1 {
-	padding-top: 20px;
-	color: #7b1e1e;
-}
-a:hover {
-	text-decoration: underline;
-	color: #8ec6d9;
-}
-.content {
-    margin: 0;
-    padding: 0;
-}
-.dualbrand {
-	padding-top: 20px;
-}
-.wildfly {
-	float:left;
-	margin-left: 10px;
-}
-.logo{
-    margin-bottom: 10px;
-}
-.note {
-	font-size: 8pt;
-	color: #aaaaaa;
-}
+<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.product" slot="iam">
+
+    <resources>
+        <resource-root path="dir"/>
+        <!-- Insert resources here -->
+    </resources>
+
+    <dependencies>
+    </dependencies>
+</module>

distribution/eap6-server-dist/src/main/welcome-content/index.html

@@ -0,0 +1,99 @@
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright (c) 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+	<title>Red Hat Single Sign-On</title>
+
+    <!-- Redirect to the freemarker generated page -->
+	<script type="text/javascript">
+	    window.location.href = "auth"
+	</script>
+	<meta http-equiv="refresh" content="1; url=auth">
+	<link rel="shortcut icon" href="auth/welcome-content/favicon.ico" type="image/x-icon">
+	<link rel="StyleSheet" href="auth/welcome-content/keycloak.css" type="text/css">
+    <!-- proper charset -->
+	<meta http-equiv="content-type" content="text/html; charset=utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8">
+	<style type="text/css">
+	label {
+			display: inline-block;
+			width: 200px;
+			text-align: right;
+			margin-right: 10px;
+		}
+
+		button {
+			margin-left: 215px;
+		}
+
+		form {
+			background-color: #eee;
+			border: 1px solid #666;
+			padding-bottom: 1em;
+		}
+
+		.error {
+			color: #a30000;
+		}
+	</style>
+</head>
+
+<body>
+	<div id="container" style="position: absolute; left: 0px; top: 0px; right: 0px; bottom: 0px;">
+		
+        <!-- header -->
+		<div class="header-panel">
+			<div class="header-line">
+				&nbsp;
+			</div>
+
+			<div class="header-top">
+				<div class="prod-title"><img class="prod-img" alt="Red Hat® Single Sign-On" src="auth/welcome-content/brand.svg"></div>
+			</div>
+
+			<div class="header-bottom">
+				&nbsp;
+			</div>
+		</div>
+
+        <!-- main content -->
+		<div id="content">
+			<div class="section">
+				<h1>Welcome to Red Hat Single Sign-On</h1>
+
+				<h3>Your Red Hat Single Sign-On is running.</h3>
+
+				<p>Go to <a href="http://localhost:8080/auth">http://localhost:8080/auth</a> if you need to create the inital admin user.</p>
+
+				<p><a href="auth/admin/">Administration Console</a> | <a href="http://www.keycloak.org/docs">Documentation</a></p>
+			</div>
+		</div>
+
+		<div id="footer">
+			&nbsp;
+		</div>
+	</div>
+</body>
+</html>
+

distribution/examples-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

distribution/feature-packs/adapter-feature-pack/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.keycloak</groupId>
         <artifactId>feature-packs-parent</artifactId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

distribution/feature-packs/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>distribution-pom</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Feature Pack Builds</name>

distribution/feature-packs/server-feature-pack/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.keycloak</groupId>
         <artifactId>feature-packs-parent</artifactId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json

@@ -31,7 +31,7 @@
     },
 
     "theme": {
-        "default": "keycloak",
+        "default": "rh-sso",
         "staticMaxAge": 2592000,
         "cacheTemplates": true,
         "cacheThemes": true,
@@ -60,4 +60,4 @@
             "cacheContainer" : "java:comp/env/infinispan/Keycloak"
         }
     }
-}
+}

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml

@@ -6,8 +6,8 @@
             <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
             <module name="org.keycloak.keycloak-connections-jpa" services="import" meta-inf="import"/>
             <module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
-            <module name="org.keycloak.keycloak-connections-mongo" services="import"/>
-            <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>
+            <!--<module name="org.keycloak.keycloak-connections-mongo" services="import"/>
+            <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>-->
             <module name="org.keycloak.keycloak-connections-truststore" services="import"/>
             <module name="org.keycloak.keycloak-common" services="import"/>
             <module name="org.keycloak.keycloak-core" services="import"/>
@@ -17,7 +17,7 @@
             <module name="org.keycloak.keycloak-events-email" services="import"/>
             <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
             <module name="org.keycloak.keycloak-events-jpa" services="import"/>
-            <module name="org.keycloak.keycloak-events-mongo" services="import"/>
+            <!--<module name="org.keycloak.keycloak-events-mongo" services="import"/>-->
             <module name="org.keycloak.keycloak-export-import-api" services="import"/>
             <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
             <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
@@ -32,7 +32,7 @@
             <module name="org.keycloak.keycloak-login-freemarker" services="import"/>
             <module name="org.keycloak.keycloak-model-api" services="import"/>
             <module name="org.keycloak.keycloak-model-jpa" services="import"/>
-            <module name="org.keycloak.keycloak-model-mongo" services="import"/>
+            <!--<module name="org.keycloak.keycloak-model-mongo" services="import"/>-->
             <module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
             <module name="org.keycloak.keycloak-saml-protocol" services="import"/>
             <module name="org.keycloak.keycloak-services" export="true" services="import"/>

distribution/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,14 +17,15 @@
     <modules>
         <module>adapters</module>
         <module>saml-adapters</module>
-        <module>demo-dist</module>
-        <module>docs-dist</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>
+        <!--<module>proxy-dist</module>-->
+        <!--<module>server-dist</module>-->
         <module>server-overlay</module>
         <module>src-dist</module>
-        <module>feature-packs</module>
+        <!--<module>feature-packs</module>-->
     </modules>
 
     <profiles>

distribution/proxy-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 
@@ -57,6 +57,10 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-tomcat-adapter-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-jboss-adapter-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>

distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/as7-eap6-adapter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak SAML AS7 / JBoss EAP 6 Adapter Distros</name>
@@ -15,7 +15,7 @@
 
     <modules>
         <module>as7-modules</module>
-        <module>as7-adapter-zip</module>
+        <!--<module>as7-adapter-zip</module>-->
         <module>eap6-adapter-zip</module>
     </modules>
 </project>

distribution/saml-adapters/jetty81-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/jetty92-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -15,14 +15,14 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>wildfly-adapter</module>
-        <module>tomcat6-adapter-zip</module>
-        <module>tomcat7-adapter-zip</module>
-        <module>tomcat8-adapter-zip</module>
-        <module>jetty81-adapter-zip</module>
+        <!--<module>wildfly-adapter</module>-->
+        <!--<module>tomcat6-adapter-zip</module>-->
+        <!--<module>tomcat7-adapter-zip</module>-->
+        <!--<module>tomcat8-adapter-zip</module>-->
+        <!--<module>jetty81-adapter-zip</module>-->
         <!-- jetty 9.1 doesn't work right now
         <module>jetty91-adapter-zip</module> -->
-        <module>jetty92-adapter-zip</module>
+        <!--<module>jetty92-adapter-zip</module>-->
         <module>as7-eap6-adapter</module>
     </modules>
 </project>

distribution/saml-adapters/tomcat6-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/tomcat7-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/tomcat8-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/wildfly-adapter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak Wildfly SAML Adapter</name>

distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/server-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

distribution/server-overlay/eap6/eap6-server-modules/build.xml

@@ -264,7 +264,7 @@
 
         <!-- mongo -->
 
-        <module-def name="org.keycloak.keycloak-connections-mongo">
+        <!--<module-def name="org.keycloak.keycloak-connections-mongo">
             <maven-resource group="org.keycloak" artifact="keycloak-connections-mongo"/>
         </module-def>
 
@@ -282,7 +282,7 @@
 
         <module-def name="org.mongodb.mongo-java-driver">
             <maven-resource group="org.mongodb" artifact="mongo-java-driver"/>
-        </module-def>
+        </module-def>-->
 
         <module-def name="org.liquibase">
             <maven-resource group="org.liquibase" artifact="liquibase-core"/>

distribution/server-overlay/eap6/eap6-server-modules/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-connections-mongo-update">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.keycloak.keycloak-connections-mongo"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-connections-mongo">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-eap6-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml

@@ -6,8 +6,8 @@
             <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
             <module name="org.keycloak.keycloak-connections-jpa" services="import" meta-inf="import"/>
             <module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
-            <module name="org.keycloak.keycloak-connections-mongo" services="import"/>
-            <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>
+            <!--<module name="org.keycloak.keycloak-connections-mongo" services="import"/>
+            <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>-->
             <module name="org.keycloak.keycloak-connections-truststore" services="import"/>
             <module name="org.keycloak.keycloak-common" services="import"/>
             <module name="org.keycloak.keycloak-core" services="import"/>
@@ -17,7 +17,7 @@
             <module name="org.keycloak.keycloak-events-email" services="import"/>
             <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
             <module name="org.keycloak.keycloak-events-jpa" services="import"/>
-            <module name="org.keycloak.keycloak-events-mongo" services="import"/>
+            <!--<module name="org.keycloak.keycloak-events-mongo" services="import"/>-->
             <module name="org.keycloak.keycloak-export-import-api" services="import"/>
             <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
             <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
@@ -32,7 +32,7 @@
             <module name="org.keycloak.keycloak-login-freemarker" services="import"/>
             <module name="org.keycloak.keycloak-model-api" services="import"/>
             <module name="org.keycloak.keycloak-model-jpa" services="import"/>
-            <module name="org.keycloak.keycloak-model-mongo" services="import"/>
+            <!--<module name="org.keycloak.keycloak-model-mongo" services="import"/>-->
             <module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
             <module name="org.keycloak.keycloak-saml-protocol" services="import"/>
             <module name="org.keycloak.keycloak-services" export="true" services="import"/>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-events-mongo">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.keycloak.keycloak-events-api"/>
-        <module name="org.keycloak.keycloak-connections-mongo"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-model-mongo">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.keycloak.keycloak-connections-mongo"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml

@@ -16,8 +16,8 @@
         <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
         <module name="org.keycloak.keycloak-connections-jpa" services="import"/>
         <module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
-        <module name="org.keycloak.keycloak-connections-mongo" services="import"/>
-        <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>
+        <!--<module name="org.keycloak.keycloak-connections-mongo" services="import"/>
+        <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>-->
         <module name="org.keycloak.keycloak-connections-truststore" services="import"/>
         <module name="org.keycloak.keycloak-common" services="import"/>
         <module name="org.keycloak.keycloak-core" services="import"/>
@@ -27,7 +27,7 @@
         <module name="org.keycloak.keycloak-events-email" services="import"/>
         <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
         <module name="org.keycloak.keycloak-events-jpa" services="import"/>
-        <module name="org.keycloak.keycloak-events-mongo" services="import"/>
+        <!--<module name="org.keycloak.keycloak-events-mongo" services="import"/>-->
         <module name="org.keycloak.keycloak-export-import-api" services="import"/>
         <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
         <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
@@ -42,7 +42,7 @@
         <module name="org.keycloak.keycloak-login-freemarker" services="import"/>
         <module name="org.keycloak.keycloak-model-api" services="import"/>
         <module name="org.keycloak.keycloak-model-jpa" services="import"/>
-        <module name="org.keycloak.keycloak-model-mongo" services="import"/>
+        <!--<module name="org.keycloak.keycloak-model-mongo" services="import"/>-->
         <module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
 
         <module name="org.keycloak.keycloak-saml-core" services="import"/>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.1" name="org.mongodb.mongo-java-driver">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/server-overlay/eap6/eap6-server-overlay/cli/keycloak-install-ha.cli

@@ -5,7 +5,6 @@
 /subsystem=infinispan/cache-container=keycloak/invalidation-cache=realms:add(mode="SYNC")
 /subsystem=infinispan/cache-container=keycloak/invalidation-cache=users:add(mode="SYNC")
 /subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions:add(mode="SYNC",owners="1")
-/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineSessions:add(mode="SYNC",owners="1")
 /subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures:add(mode="SYNC",owners="1")
 /extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
 /subsystem=keycloak-server:add(web-context=auth)

distribution/server-overlay/eap6/eap6-server-overlay/cli/keycloak-install.cli

@@ -4,7 +4,6 @@
 /subsystem=infinispan/cache-container=keycloak/local-cache=realms:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=users:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=sessions:add()
-/subsystem=infinispan/cache-container=keycloak/local-cache=offlineSessions:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=loginFailures:add()
 /extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
 /subsystem=keycloak-server:add(web-context=auth)

distribution/server-overlay/eap6/eap6-server-overlay/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/server-overlay/eap6/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/server-overlay/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -15,7 +15,7 @@
 
 
     <modules>
-        <module>wildfly</module>
+        <!--<module>wildfly</module>-->
         <module>eap6</module>
     </modules>
 </project>

distribution/server-overlay/wildfly/cli/keycloak-install-ha.cli

@@ -1,10 +0,0 @@
-/subsystem=datasources/data-source=KeycloakDS/:add(connection-url="jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE",driver-name=h2,jndi-name=java:jboss/datasources/KeycloakDS,password=sa,user-name=sa,use-java-context=true,enabled=true)
-/subsystem=infinispan/cache-container=keycloak:add(jndi-name="infinispan/Keycloak")
-/subsystem=infinispan/cache-container=keycloak/transport=TRANSPORT:add(lock-timeout=60000)
-/subsystem=infinispan/cache-container=keycloak/invalidation-cache=realms:add(mode="SYNC")
-/subsystem=infinispan/cache-container=keycloak/invalidation-cache=users:add(mode="SYNC")
-/subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions:add(mode="SYNC",owners="1")
-/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineSessions:add(mode="SYNC",owners="1")
-/subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures:add(mode="SYNC",owners="1")
-/extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
-/subsystem=keycloak-server:add(web-context=auth)

distribution/server-overlay/wildfly/cli/keycloak-install.cli

@@ -3,7 +3,6 @@
 /subsystem=infinispan/cache-container=keycloak/local-cache=realms:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=users:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=sessions:add()
-/subsystem=infinispan/cache-container=keycloak/local-cache=offlineSessions:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=loginFailures:add()
 /extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
 /subsystem=keycloak-server:add(web-context=auth)

distribution/server-overlay/wildfly/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/src-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

docbook/auth-server-docs/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-docbook-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

docbook/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Keycloak Documentation</name>

docbook/saml-adapter-docs/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-docbook-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

docbook/saml-adapter-docs/reference/en/en-US/modules/adapter-config.xml

@@ -375,10 +375,10 @@
             </variablelist>
         </para>
     </section>    <section>
-    <title>IDP SingleLogoutService sub element</title>
+    <title>IDP SingleSignOnService sub element</title>
     <para>
-        The <literal>SingleLogoutService</literal> sub element defines the
-        logout SAML endpoint of the IDP.
+        The <literal>SignleSignOnService</literal> sub element defines the
+        login SAML endpoint of the IDP.
     </para>
     <programlisting><![CDATA[
 <SingleLogoutService validateRequestSignature="true"

events/api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-events-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

events/email/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-events-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

events/jboss-logging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-events-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -38,6 +38,11 @@
             <artifactId>resteasy-jaxrs</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+	        <groupId>org.jboss.spec.javax.annotation</groupId>
+	        <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

events/jpa/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-events-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

events/mongo/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-events-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>