keycloak-memoizeit

Merge pull request #2070 from patriot1burke/master infinispan …

1/20/2016 7:15:16 PM

reorg

Bill Burke

Commit: fd83f0a

Parents: 94fa1b2
83ecef2

Changes

connections/infinispan/pom.xml 32(+0 -32)

connections/pom.xml 30(+0 -30)

dependencies/server-all/pom.xml 10(+1 -9)

dependencies/server-min/pom.xml 4(+0 -4)

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml 20(+0 -20)

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml 20(+0 -20)

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-infinispan/main/module.xml 4(+2 -2)

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml 19(+0 -19)

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 5(+1 -4)

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml 5(+1 -4)

model/infinispan/pom.xml 8(+2 -6)

model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProvider.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanConnectionProvider.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanConnectionProviderFactory.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanConnectionSpi.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientAdapter.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientTemplateAdapter.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultCacheRealmProvider.java 28(+24 -4)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultCacheUserProvider.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheRealmProviderFactory.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanRealmCache.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanUserCache.java 2(+0 -2)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RoleAdapter.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserAdapter.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/ClientInitialAccessAdapter.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/ClientSessionAdapter.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/Consumers.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/ClientInitialAccessEntity.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/ClientSessionEntity.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureEntity.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureKey.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/SessionEntity.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/UserSessionEntity.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProviderFactory.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/InfinispanUserSessionInitializer.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/InitializerState.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/OfflineUserSessionLoader.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/SessionInitializerWorker.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/SessionLoader.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/mapreduce/ClientInitialAccessMapper.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/mapreduce/ClientSessionMapper.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/mapreduce/ClientSessionsOfUserSessionMapper.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/mapreduce/FirstResultReducer.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/mapreduce/LargestResultReducer.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/mapreduce/SessionMapper.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/mapreduce/UserLoginFailureMapper.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/mapreduce/UserSessionMapper.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/mapreduce/UserSessionNoteMapper.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/ClientInitialAccessPredicate.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/ClientSessionPredicate.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Comparators.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionPredicate.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/UserLoginFailurePredicate.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/UserSessionPredicate.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UsernameLoginFailureAdapter.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java 0(+0 -0)

model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionTimestamp.java 0(+0 -0)

model/infinispan/src/main/resources/META-INF/services/org.keycloak.connections.infinispan.InfinispanConnectionProviderFactory 0(+0 -0)

model/infinispan/src/main/resources/META-INF/services/org.keycloak.models.cache.CacheRealmProviderFactory 0(+0 -0)

model/infinispan/src/main/resources/META-INF/services/org.keycloak.models.cache.CacheUserProviderFactory 0(+0 -0)

model/infinispan/src/main/resources/META-INF/services/org.keycloak.models.UserSessionProviderFactory 0(+0 -0)

model/infinispan/src/main/resources/META-INF/services/org.keycloak.provider.Spi 0(+0 -0)

model/infinispan/src/test/java/org/keycloak/models/sessions/infinispan/initializer/InitializerStateTest.java 0(+0 -0)

model/invalidation-cache/infinispan/pom.xml 35(+0 -35)

model/invalidation-cache/model-adapters/pom.xml 72(+0 -72)

model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.provider.Spi 2(+0 -2)

model/invalidation-cache/pom.xml 31(+0 -31)

model/pom.xml 3(+1 -2)

pom.xml 19(+2 -17)

server-spi/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/CacheUserProvider.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/CacheUserProviderFactory.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/CacheUserProviderSpi.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/entities/CachedClient.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/entities/CachedClientRole.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/entities/CachedClientTemplate.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/entities/CachedGroup.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/entities/CachedRealmRole.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/entities/CachedRole.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/entities/CachedUser.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/RealmCache.java 0(+0 -0)

server-spi/src/main/java/org/keycloak/models/cache/UserCache.java 0(+0 -0)

server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi 3(+2 -1)

services/pom.xml 4(+0 -4)

Details

dependencies/server-all/pom.xml 10(+1 -9)

diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml
index 407a340..4a2ff44 100755
--- a/dependencies/server-all/pom.xml
+++ b/dependencies/server-all/pom.xml
@@ -22,19 +22,11 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-connections-infinispan</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-jpa</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-sessions-infinispan</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-invalidation-cache-infinispan</artifactId>
+            <artifactId>keycloak-model-infinispan</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>

dependencies/server-min/pom.xml 4(+0 -4)

diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml
index d60e68d..c7c6375 100755
--- a/dependencies/server-min/pom.xml
+++ b/dependencies/server-min/pom.xml
@@ -45,10 +45,6 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-invalidation-cache-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-events-jboss-logging</artifactId>
         </dependency>
         <dependency>

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 5(+1 -4)

diff --git a/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 b/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
index 873d54e..352871e 100755
--- a/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
+++ b/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
@@ -1,21 +1,18 @@
 <jboss-deployment-structure>
     <deployment>
         <dependencies>
-            <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
             <module name="org.keycloak.keycloak-common" services="import"/>
             <module name="org.keycloak.keycloak-core" services="import"/>
             <module name="org.keycloak.keycloak-events-email" services="import"/>
             <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
             <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
-            <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>
-            <module name="org.keycloak.keycloak-invalidation-cache-model" services="import"/>
             <module name="org.keycloak.keycloak-js-adapter" services="import"/>
             <module name="org.keycloak.keycloak-kerberos-federation" services="import"/>
             <module name="org.keycloak.keycloak-ldap-federation" services="import"/>
             <module name="org.keycloak.keycloak-server-spi" services="import"/>
             <module name="org.keycloak.keycloak-model-jpa" services="import" meta-inf="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-model-infinispan" services="import"/>
             <module name="org.keycloak.keycloak-saml-protocol" services="import"/>
             <module name="org.keycloak.keycloak-services" export="true" services="import"/>
             <module name="org.keycloak.keycloak-social-facebook" services="import"/>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml 5(+1 -4)

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
index 36c90f2..c013524 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
@@ -9,21 +9,18 @@
     <dependencies>
         <module name="org.keycloak.keycloak-broker-oidc" services="import"/>
         <module name="org.keycloak.keycloak-broker-saml" services="import"/>
-        <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
         <module name="org.keycloak.keycloak-common" services="import"/>
         <module name="org.keycloak.keycloak-core" services="import"/>
         <module name="org.keycloak.keycloak-events-email" services="import"/>
         <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
         <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
-        <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>
-        <module name="org.keycloak.keycloak-invalidation-cache-model" services="import"/>
         <module name="org.keycloak.keycloak-js-adapter" services="import"/>
         <module name="org.keycloak.keycloak-kerberos-federation" services="import"/>
         <module name="org.keycloak.keycloak-ldap-federation" services="import"/>
         <module name="org.keycloak.keycloak-server-spi" 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-sessions-infinispan" services="import"/>
+        <module name="org.keycloak.keycloak-model-infinispan" services="import"/>
         <module name="org.keycloak.keycloak-saml-core" services="import"/>
         <module name="org.keycloak.keycloak-saml-protocol" services="import"/>
         <module name="org.keycloak.keycloak-services" export="true" services="import"/>

model/pom.xml 3(+1 -2)

diff --git a/model/pom.xml b/model/pom.xml
index 2236cb3..5784d9e 100755
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -25,9 +25,8 @@
         </plugins>
     </build>
     <modules>
-        <module>invalidation-cache</module>
         <module>jpa</module>
         <module>mongo</module>
-        <module>sessions-infinispan</module>
+        <module>infinispan</module>
     </modules>
 </project>

pom.xml 19(+2 -17)

diff --git a/pom.xml b/pom.xml
index ea2053e..7b910ee 100755
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,6 @@
         <module>common</module>
         <module>core</module>
         <module>client-registration</module>
-        <module>connections</module>
         <module>dependencies</module>
         <module>server-spi</module>
         <module>integration</module>
@@ -150,6 +149,7 @@
         <module>model</module>
         <module>events</module>
         <module>saml</module>
+        <!-- force -->
         <module>broker</module>
         <module>social</module>
         <module>forms</module>
@@ -617,11 +617,6 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-connections-infinispan</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-client-registration-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -889,16 +884,6 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-invalidation-cache-infinispan</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-invalidation-cache-model</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-model-jpa</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -909,7 +894,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-model-sessions-infinispan</artifactId>
+                <artifactId>keycloak-model-infinispan</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi 3(+2 -1)

diff --git a/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
index 9a22e0f..2bf07b1 100755
--- a/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
@@ -25,5 +25,6 @@ org.keycloak.email.EmailTemplateSpi
 org.keycloak.theme.ThemeSpi
 org.keycloak.truststore.TruststoreSpi
 org.keycloak.connections.httpclient.HttpClientSpi
-
+org.keycloak.models.cache.CacheRealmProviderSpi
+org.keycloak.models.cache.CacheUserProviderSpi

services/pom.xml 4(+0 -4)

diff --git a/services/pom.xml b/services/pom.xml
index 1f83ab4..fa206c9 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -45,10 +45,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-invalidation-cache-model</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>
             <artifactId>jboss-servlet-api_3.0_spec</artifactId>
         </dependency>