keycloak-aplcache

diff --git a/distribution/adapters/pom.xml b/distribution/adapters/pom.xml
index 8861142..164634f 100755
--- a/distribution/adapters/pom.xml
+++ b/distribution/adapters/pom.xml
@@ -1,10 +1,9 @@
 <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">
     <parent>
-        <artifactId>keycloak-parent</artifactId>
+        <artifactId>keycloak-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <name>Adapters Distribution Parent</name>

diff --git a/distribution/demo-dist/assembly.xml b/distribution/demo-dist/assembly.xml
index bd169bf..098e2d2 100755
--- a/distribution/demo-dist/assembly.xml
+++ b/distribution/demo-dist/assembly.xml
@@ -28,9 +28,6 @@
         <fileSet>
             <directory>${project.build.directory}/unpacked/keycloak-server-overlay-${project.version}</directory>
             <outputDirectory>keycloak</outputDirectory>
-            <excludes>
-                <exclude>standalone/configuration/standalone-keycloak.xml</exclude>
-            </excludes>
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}/unpacked/keycloak-wildfly-adapter-${project.version}</directory>

diff --git a/distribution/demo-dist/pom.xml b/distribution/demo-dist/pom.xml
index 5fc4eb9..49c1d36 100755
--- a/distribution/demo-dist/pom.xml
+++ b/distribution/demo-dist/pom.xml
@@ -2,10 +2,9 @@
          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>
+        <artifactId>keycloak-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-demo-dist</artifactId>
@@ -159,6 +158,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xml-maven-plugin</artifactId>

diff --git a/distribution/docs-dist/pom.xml b/distribution/docs-dist/pom.xml
index 32ddea9..2698405 100755
--- a/distribution/docs-dist/pom.xml
+++ b/distribution/docs-dist/pom.xml
@@ -2,10 +2,9 @@
          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>
+        <artifactId>keycloak-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-docs-dist</artifactId>

diff --git a/distribution/downloads/pom.xml b/distribution/downloads/pom.xml
index f34b99b..6dc0d8c 100755
--- a/distribution/downloads/pom.xml
+++ b/distribution/downloads/pom.xml
@@ -2,8 +2,8 @@
          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-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <artifactId>distribution-pom</artifactId>
         <version>1.9.0.CR1-SNAPSHOT</version>
     </parent>
 

diff --git a/distribution/examples-dist/pom.xml b/distribution/examples-dist/pom.xml
index 37b0e23..4dfb8bd 100755
--- a/distribution/examples-dist/pom.xml
+++ b/distribution/examples-dist/pom.xml
@@ -2,10 +2,9 @@
          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>
+        <artifactId>keycloak-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-examples-dist</artifactId>

diff --git a/distribution/feature-packs/pom.xml b/distribution/feature-packs/pom.xml
index 9935abd..d02c1be 100644
--- a/distribution/feature-packs/pom.xml
+++ b/distribution/feature-packs/pom.xml
@@ -1,11 +1,11 @@
 <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">
     <parent>
-        <artifactId>distribution-pom</artifactId>
+        <artifactId>keycloak-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <name>Feature Pack Builds</name>
     <description/>
     <modelVersion>4.0.0</modelVersion>

diff --git a/distribution/pom.xml b/distribution/pom.xml
index c77522e..54e80ba 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -11,7 +11,7 @@
     <description/>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>distribution-pom</artifactId>
+    <artifactId>keycloak-distribution-parent</artifactId>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/distribution/proxy-dist/pom.xml b/distribution/proxy-dist/pom.xml
index e59fec2..35b4835 100755
--- a/distribution/proxy-dist/pom.xml
+++ b/distribution/proxy-dist/pom.xml
@@ -2,10 +2,9 @@
          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>
+        <artifactId>keycloak-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-proxy-dist</artifactId>

diff --git a/distribution/saml-adapters/pom.xml b/distribution/saml-adapters/pom.xml
index bd59a06..bd13b3d 100755
--- a/distribution/saml-adapters/pom.xml
+++ b/distribution/saml-adapters/pom.xml
@@ -1,10 +1,9 @@
 <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">
     <parent>
-        <artifactId>keycloak-parent</artifactId>
+        <artifactId>keycloak-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <name>SAML Adapters Distribution Parent</name>

diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml
index 0c81f16..1041da8 100755
--- a/distribution/server-dist/pom.xml
+++ b/distribution/server-dist/pom.xml
@@ -2,10 +2,9 @@
          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>
+        <artifactId>keycloak-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-server-dist</artifactId>

diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index 366e1ec..f2ae69a 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -2,20 +2,76 @@
          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>
+        <artifactId>keycloak-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>keycloak-server-overlay-parent</artifactId>
+    <artifactId>keycloak-server-overlay</artifactId>
     <packaging>pom</packaging>
-    <name>Keycloak Server Overlay Parent</name>
+    <name>Keycloak Server Overlay Distribution</name>
     <description/>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-server-dist</artifactId>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>keycloak-overlay-${project.version}</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-server-dist</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.keycloak</groupId>
+                                    <artifactId>keycloak-server-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>
 
-    <modules>
-        <module>wildfly</module>
-        <module>eap6</module>
-    </modules>
 </project>

diff --git a/distribution/src-dist/pom.xml b/distribution/src-dist/pom.xml
index 5fbf03e..e9fe167 100755
--- a/distribution/src-dist/pom.xml
+++ b/distribution/src-dist/pom.xml
@@ -2,10 +2,9 @@
          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>
+        <artifactId>keycloak-distribution-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-src-dist</artifactId>

diff --git a/docbook/auth-server-docs/pom.xml b/docbook/auth-server-docs/pom.xml
index 7e1d1e8..80bb86d 100755
--- a/docbook/auth-server-docs/pom.xml
+++ b/docbook/auth-server-docs/pom.xml
@@ -118,6 +118,10 @@
                             <name>wildfly.version</name>
                             <value>${wildfly.version}</value>
                         </injection>
+                        <injection>
+                            <name>eap.version</name>
+                            <value>${eap.version}</value>
+                        </injection>
                     </injections>
                     <options>
                         <xmlTransformerType>saxon</xmlTransformerType>

diff --git a/docbook/auth-server-docs/reference/en/en-US/modules/server-installation.xml b/docbook/auth-server-docs/reference/en/en-US/modules/server-installation.xml
index b660e78..a1f0d9f 100755
--- a/docbook/auth-server-docs/reference/en/en-US/modules/server-installation.xml
+++ b/docbook/auth-server-docs/reference/en/en-US/modules/server-installation.xml
@@ -38,37 +38,23 @@
 
 
         <section id="overlay_install">
-            <title>Install on existing WildFly &wildfly.version;</title>
+            <title>Install on existing WildFly &wildfly.version; or JBoss EAP &eap.version;</title>
             <para>
-                Keycloak can be installed into an existing WildFly &wildfly.version; server. To do this download
-                <literal>keycloak-overlay-&project.version;.zip</literal> or <literal>keycloak-overlay-&project.version;.tar.gz</literal>.
-                Once downloaded extract into the root directory of your WildFly installation. To start WildFly with Keycloak
-                run:
-                <programlisting>&lt;WILDFLY_HOME&gt;/bin/standalone.sh --server-config=standalone-keycloak.xml</programlisting>
-                or:
-                <programlisting>&lt;WILDFLY_HOME&gt;/bin/standalone.bat --server-config=standalone-keycloak.xml</programlisting>
+                Keycloak can be installed into an existing installations of WildFly &wildfly.version; or JBoss EAP &eap.version;.
+                To do this download <literal>keycloak-overlay-&project.version;.zip</literal> or <literal>keycloak-overlay-&project.version;.tar.gz</literal>.
+                Once downloaded extract into the root directory of your installation.
             </para>
             <para>
-                To add Keycloak to other sever configurations (standalone.xml, standalone-ha.xml, etc.) start the server with
-                the desired server-config. If you are running the server in standalone mode run:
+                To add Keycloak to existing standalone.xml server config run:
 <programlisting>
-cd &lt;WILDFLY_HOME&gt;/bin
-./jboss-cli.sh -c --file=keycloak-install.cli
+bin/jboss-cli.sh --file=keycloak-install.cli
 </programlisting>
-                Or if you are running in clustering (HA) mode (by having used -c standalone-ha.xml) then run:
+                To add Keycloak to existing standalone-ha.xml server config run:
 <programlisting>
-cd &lt;WILDFLY_HOME&gt;/bin
-./jboss-cli.sh -c --file=keycloak-install-ha.cli
+    bin/jboss-cli.sh --file=keycloak-install.cli
 </programlisting>
-                You may see exceptions in the server log, but after restarting the server they should be gone.
-                You can restart the server with:
-                <programlisting>&lt;WILDFLY_HOME&gt;/bin/jboss-cli.sh -c :reload</programlisting>
-            </para>
-        </section>
-        <section>
-            <title>Install on existing JBoss EAP 6.4.0.GA</title>
-            <para>
-                Same procedure as WildFly &wildfly.version;, but download <literal>keycloak-overlay-eap6-&project.version;.zip</literal> or <literal>keycloak-overlay-eap6-&project.version;.tar.gz</literal>.
+                If you want to add Keycloak to a different server config edit keycloak-install.cli or keycloak-install-ha.cli
+                and change the name of the server config.
             </para>
         </section>
         <section>

diff --git a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheRealmProviderFactory.java b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheRealmProviderFactory.java
index 5aec527..2a31be8 100755
--- a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheRealmProviderFactory.java
+++ b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheRealmProviderFactory.java
@@ -34,8 +34,6 @@ public class InfinispanCacheRealmProviderFactory implements CacheRealmProviderFa
 
     protected final ConcurrentHashMap<String, String> realmLookup = new ConcurrentHashMap<>();
 
-    private boolean isNewInfinispan;
-
     @Override
     public CacheRealmProvider create(KeycloakSession session) {
         lazyInit(session);
@@ -46,8 +44,6 @@ public class InfinispanCacheRealmProviderFactory implements CacheRealmProviderFa
         if (realmCache == null) {
             synchronized (this) {
                 if (realmCache == null) {
-                    checkIspnVersion();
-
                     Cache<String, Object> cache = session.getProvider(InfinispanConnectionProvider.class).getCache(InfinispanConnectionProvider.REALM_CACHE_NAME);
                     cache.addListener(new CacheListener());
                     realmCache = new InfinispanRealmCache(cache, realmLookup);
@@ -56,15 +52,6 @@ public class InfinispanCacheRealmProviderFactory implements CacheRealmProviderFa
         }
     }
 
-    protected void checkIspnVersion() {
-        try {
-            CacheEntryCreatedEvent.class.getMethod("getValue");
-            isNewInfinispan = true;
-        } catch (NoSuchMethodException nsme) {
-            isNewInfinispan = false;
-        }
-    }
-
     @Override
     public void init(Config.Scope config) {
     }
@@ -89,16 +76,7 @@ public class InfinispanCacheRealmProviderFactory implements CacheRealmProviderFa
         @CacheEntryCreated
         public void created(CacheEntryCreatedEvent<String, Object> event) {
             if (!event.isPre()) {
-                Object object;
-
-                // Try optimized version if available
-                if (isNewInfinispan) {
-                    object = event.getValue();
-                } else {
-                    String id = event.getKey();
-                    object = event.getCache().get(id);
-                }
-
+                Object object = event.getValue();
                 if (object != null) {
                     if (object instanceof CachedRealm) {
                         CachedRealm realm = (CachedRealm) object;

diff --git a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java
index ec69912..f99513f 100755
--- a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java
+++ b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java
@@ -32,9 +32,6 @@ public class InfinispanCacheUserProviderFactory implements CacheUserProviderFact
 
     protected final RealmLookup emailLookup = new RealmLookup();
 
-    // Method CacheEntryCreatedEvent.getValue is available from ispn 6 (EAP6 and AS7 are on ispn 5)
-    private boolean isNewInfinispan;
-
     @Override
     public CacheUserProvider create(KeycloakSession session) {
         lazyInit(session);
@@ -45,7 +42,6 @@ public class InfinispanCacheUserProviderFactory implements CacheUserProviderFact
         if (userCache == null) {
             synchronized (this) {
                 if (userCache == null) {
-                    checkIspnVersion();
                     Cache<String, CachedUser> cache = session.getProvider(InfinispanConnectionProvider.class).getCache(InfinispanConnectionProvider.USER_CACHE_NAME);
                     cache.addListener(new CacheListener());
                     userCache = new InfinispanUserCache(cache, usernameLookup, emailLookup);
@@ -54,15 +50,6 @@ public class InfinispanCacheUserProviderFactory implements CacheUserProviderFact
         }
     }
 
-    protected void checkIspnVersion() {
-        try {
-            CacheEntryCreatedEvent.class.getMethod("getValue");
-            isNewInfinispan = true;
-        } catch (NoSuchMethodException nsme) {
-            isNewInfinispan = false;
-        }
-    }
-
     @Override
     public void init(Config.Scope config) {
     }
@@ -87,16 +74,7 @@ public class InfinispanCacheUserProviderFactory implements CacheUserProviderFact
         @CacheEntryCreated
         public void userCreated(CacheEntryCreatedEvent<String, CachedUser> event) {
             if (!event.isPre()) {
-                CachedUser user;
-
-                // Try optimized version if available
-                if (isNewInfinispan) {
-                    user = event.getValue();
-                } else {
-                    String userId = event.getKey();
-                    user = event.getCache().get(userId);
-                }
-
+                CachedUser user = event.getValue();
                 if (user != null) {
                     String realm = user.getRealm();
 

diff --git a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProviderFactory.java b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProviderFactory.java
index e18aa84..0d3bc52 100755
--- a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProviderFactory.java
+++ b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProviderFactory.java
@@ -1,20 +1,10 @@
 package org.keycloak.models.sessions.infinispan;
 
 import org.infinispan.Cache;
-import org.infinispan.Version;
 import org.jboss.logging.Logger;
 import org.keycloak.Config;
 import org.keycloak.connections.infinispan.InfinispanConnectionProvider;
-import org.keycloak.models.ClientModel;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.KeycloakSessionFactory;
-import org.keycloak.models.KeycloakSessionTask;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserSessionProvider;
-import org.keycloak.models.UserSessionProviderFactory;
-import org.keycloak.models.session.UserSessionPersisterProvider;
-import org.keycloak.models.sessions.infinispan.compat.MemUserSessionProviderFactory;
-import org.keycloak.models.sessions.infinispan.compat.SimpleUserSessionInitializer;
+import org.keycloak.models.*;
 import org.keycloak.models.sessions.infinispan.entities.LoginFailureEntity;
 import org.keycloak.models.sessions.infinispan.entities.LoginFailureKey;
 import org.keycloak.models.sessions.infinispan.entities.SessionEntity;
@@ -25,33 +15,20 @@ import org.keycloak.models.utils.PostMigrationEvent;
 import org.keycloak.provider.ProviderEvent;
 import org.keycloak.provider.ProviderEventListener;
 
-/**
- * Uses Infinispan to store user sessions. On EAP 6.4 (Infinispan 5.2) map reduce is not supported for local caches as a work around
- * the old memory user session provider is used in this case. This can be removed once we drop support for EAP 6.4.
- *
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
 public class InfinispanUserSessionProviderFactory implements UserSessionProviderFactory {
 
     private static final Logger log = Logger.getLogger(InfinispanUserSessionProviderFactory.class);
 
     private Config.Scope config;
-    private Boolean compatMode;
-    private MemUserSessionProviderFactory compatProviderFactory;
 
     @Override
     public UserSessionProvider create(KeycloakSession session) {
+        InfinispanConnectionProvider connections = session.getProvider(InfinispanConnectionProvider.class);
+        Cache<String, SessionEntity> cache = connections.getCache(InfinispanConnectionProvider.SESSION_CACHE_NAME);
+        Cache<String, SessionEntity> offlineSessionsCache = connections.getCache(InfinispanConnectionProvider.OFFLINE_SESSION_CACHE_NAME);
+        Cache<LoginFailureKey, LoginFailureEntity> loginFailures = connections.getCache(InfinispanConnectionProvider.LOGIN_FAILURE_CACHE_NAME);
 
-        if (!compatMode) {
-            InfinispanConnectionProvider connections = session.getProvider(InfinispanConnectionProvider.class);
-            Cache<String, SessionEntity> cache = connections.getCache(InfinispanConnectionProvider.SESSION_CACHE_NAME);
-            Cache<String, SessionEntity> offlineSessionsCache = connections.getCache(InfinispanConnectionProvider.OFFLINE_SESSION_CACHE_NAME);
-            Cache<LoginFailureKey, LoginFailureEntity> loginFailures = connections.getCache(InfinispanConnectionProvider.LOGIN_FAILURE_CACHE_NAME);
-
-            return isStreamMode() ? new InfinispanUserSessionProvider(session, cache, offlineSessionsCache, loginFailures) : new CompatInfinispanUserSessionProvider(session, cache, offlineSessionsCache, loginFailures);
-        } else {
-            return compatProviderFactory.create(session);
-        }
+        return new InfinispanUserSessionProvider(session, cache, offlineSessionsCache, loginFailures);
     }
 
     @Override
@@ -61,18 +38,6 @@ public class InfinispanUserSessionProviderFactory implements UserSessionProvider
 
     @Override
     public void postInit(final KeycloakSessionFactory factory) {
-        KeycloakModelUtils.runJobInTransaction(factory, new KeycloakSessionTask() {
-
-            @Override
-            public void run(KeycloakSession session) {
-                compatMode = isCompatMode(session);
-                if (compatMode) {
-                    compatProviderFactory = new MemUserSessionProviderFactory();
-                }
-            }
-
-        });
-
         // Max count of worker errors. Initialization will end with exception when this number is reached
         final int maxErrors = config.getInt("maxErrors", 20);
 
@@ -95,34 +60,25 @@ public class InfinispanUserSessionProviderFactory implements UserSessionProvider
     public void loadPersistentSessions(final KeycloakSessionFactory sessionFactory, final int maxErrors, final int sessionsPerSegment) {
         log.debug("Start pre-loading userSessions and clientSessions from persistent storage");
 
-        if (compatMode) {
-            SimpleUserSessionInitializer initializer = new SimpleUserSessionInitializer(sessionFactory, new OfflineUserSessionLoader(), sessionsPerSegment);
-            initializer.loadPersistentSessions();
-
-        } else {
-            KeycloakModelUtils.runJobInTransaction(sessionFactory, new KeycloakSessionTask() {
+        KeycloakModelUtils.runJobInTransaction(sessionFactory, new KeycloakSessionTask() {
 
-                @Override
-                public void run(KeycloakSession session) {
-                    InfinispanConnectionProvider connections = session.getProvider(InfinispanConnectionProvider.class);
-                    Cache<String, SessionEntity> cache = connections.getCache(InfinispanConnectionProvider.OFFLINE_SESSION_CACHE_NAME);
+            @Override
+            public void run(KeycloakSession session) {
+                InfinispanConnectionProvider connections = session.getProvider(InfinispanConnectionProvider.class);
+                Cache<String, SessionEntity> cache = connections.getCache(InfinispanConnectionProvider.OFFLINE_SESSION_CACHE_NAME);
 
-                    InfinispanUserSessionInitializer initializer = new InfinispanUserSessionInitializer(sessionFactory, cache, new OfflineUserSessionLoader(), maxErrors, sessionsPerSegment, "offlineUserSessions");
-                    initializer.initCache();
-                    initializer.loadPersistentSessions();
-                }
+                InfinispanUserSessionInitializer initializer = new InfinispanUserSessionInitializer(sessionFactory, cache, new OfflineUserSessionLoader(), maxErrors, sessionsPerSegment, "offlineUserSessions");
+                initializer.initCache();
+                initializer.loadPersistentSessions();
+            }
 
-            });
-        }
+        });
 
         log.debug("Pre-loading userSessions and clientSessions from persistent storage finished");
     }
 
     @Override
     public void close() {
-        if (compatProviderFactory != null) {
-            compatProviderFactory.close();
-        }
     }
 
     @Override
@@ -130,27 +86,5 @@ public class InfinispanUserSessionProviderFactory implements UserSessionProvider
         return "infinispan";
     }
 
-    private boolean isCompatMode(KeycloakSession session) {
-        // For unit tests
-        if (this.config.getBoolean("enforceCompat", false)) {
-            log.info("Enforced compatibility mode for infinispan. Falling back to deprecated mem user session provider.");
-            return true;
-        }
-
-        if (Version.getVersionShort() < Version.getVersionShort("5.3.0.Final")) {
-            InfinispanConnectionProvider connections = session.getProvider(InfinispanConnectionProvider.class);
-            Cache<String, SessionEntity> cache = connections.getCache(InfinispanConnectionProvider.SESSION_CACHE_NAME);
-            if (cache.getAdvancedCache().getRpcManager() == null) {
-                log.info("Infinispan version doesn't support map reduce for local cache. Falling back to deprecated mem user session provider.");
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean isStreamMode() {
-        return Version.getVersionShort() >= Version.getVersionShort("8.1.0.Final");
-    }
-
 }
 

diff --git a/pom.xml b/pom.xml
index a13138b..271ef3c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,8 @@
         <wildfly.core.version>2.0.5.Final</wildfly.core.version>
         <wildfly.build-tools.version>1.1.0.Final</wildfly.build-tools.version>
 
+        <eap.version>7.0.0.Beta</eap.version>
+
         <!-- this is EAP 6.4 alpha, publicly available -->
         <jboss.version>7.5.0.Final-redhat-15</jboss.version>
 
@@ -834,11 +836,6 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-eap6-server-subsystem</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-wf8-subsystem</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -1119,12 +1116,6 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-server-modules-eap6</artifactId>
-                <version>${project.version}</version>
-                <type>zip</type>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-saml-as7-modules</artifactId>
                 <version>${project.version}</version>
                 <type>zip</type>
@@ -1173,12 +1164,6 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-server-overlay-eap6</artifactId>
-                <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>

diff --git a/testsuite/integration/src/test/resources/META-INF/keycloak-server.json b/testsuite/integration/src/test/resources/META-INF/keycloak-server.json
index 41c2cf5..8ea3789 100755
--- a/testsuite/integration/src/test/resources/META-INF/keycloak-server.json
+++ b/testsuite/integration/src/test/resources/META-INF/keycloak-server.json
@@ -22,12 +22,6 @@
         "provider": "${keycloak.user.provider:jpa}"
     },
 
-    "userSessions": {
-        "infinispan": {
-            "enforceCompat": "${keycloak.connectionsInfinispan.enforceCompat:false}"
-        }
-    },
-
     "userSessionPersister": {
         "provider": "${keycloak.userSessionPersister.provider:jpa}"
     },

diff --git a/wildfly/pom.xml b/wildfly/pom.xml
index c9789a0..4582d87 100755
--- a/wildfly/pom.xml
+++ b/wildfly/pom.xml
@@ -17,6 +17,5 @@
         <module>adduser</module>
         <module>extensions</module>
         <module>server-subsystem</module>
-        <module>server-eap6-subsystem</module>
     </modules>
 </project>