Prosoft Git

keycloak-memoizeit

consolidate JPA

1/19/2016 8:00:58 PM
Bill Burke

Bill Burke

Commit: 9b09a91

Tree: c6333be

Parents: 46634b3

Changes

connections/jpa/pom.xml 36(+0 -36)

connections/jpa-liquibase/pom.xml 76(+0 -76)

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

dependencies/server-all/pom.xml 12(+0 -12)

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

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml 24(+0 -24)

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml 21(+0 -21)

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml 25(+0 -25)

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

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 3(+0 -3)

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

events/jpa/pom.xml 52(+0 -52)

events/pom.xml 1(+0 -1)

model/jpa/pom.xml 27(+23 -4)

model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProviderFactory.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionSpi.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/PersistenceExceptionConverter.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProviderFactory.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterSpi.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProviderFactory.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/ThreadLocalSessionContext.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/events/jpa/AdminEventEntity.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/events/jpa/EventEntity.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java 0(+0 -0)

model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProviderFactory.java 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.1.0.Beta1.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.1.0.Final.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Final.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.3.0.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.4.0.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.5.0.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.6.0.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.6.1.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.7.0.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.8.0.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml 0(+0 -0)

model/jpa/src/main/resources/META-INF/persistence.xml 0(+0 -0)

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

model/jpa/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory 0(+0 -0)

model/jpa/src/main/resources/META-INF/services/org.keycloak.events.EventStoreProviderFactory 0(+0 -0)

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

pom.xml 19(+2 -17)

Details

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

diff --git a/connections/pom.xml b/connections/pom.xml
index 3f83ab5..ebecf04 100755
--- a/connections/pom.xml
+++ b/connections/pom.xml
@@ -13,8 +13,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>jpa</module>
-        <module>jpa-liquibase</module>
         <module>infinispan</module>
         <module>mongo</module>
         <module>mongo-update</module>

dependencies/server-all/pom.xml 12(+0 -12) 

diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml
index a503d53..9165b69 100755
--- a/dependencies/server-all/pom.xml
+++ b/dependencies/server-all/pom.xml
@@ -22,14 +22,6 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-connections-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-connections-jpa-liquibase</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-connections-infinispan</artifactId>
         </dependency>
         <dependency>
@@ -46,10 +38,6 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-events-jboss-logging</artifactId>
         </dependency>
         <dependency>

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

diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml
index 2c7a0f1..edbbccf 100755
--- a/dependencies/server-min/pom.xml
+++ b/dependencies/server-min/pom.xml
@@ -49,10 +49,6 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-jpa</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-model-jpa/main/module.xml 1(+0 -1) 

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml
index dbca1ca..523a6b5 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml
@@ -10,7 +10,6 @@
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-connections-jpa" services="import"/>
         <module name="javax.persistence.api"/>
         <module name="org.jboss.logging"/>
         <module name="org.javassist"/>

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 3(+0 -3) 

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 cf81910..ed60297 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
@@ -2,8 +2,6 @@
     <deployment>
         <dependencies>
             <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-truststore" services="import"/>
@@ -11,7 +9,6 @@
             <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-events-jpa" services="import"/>
             <module name="org.keycloak.keycloak-events-mongo" services="import"/>
             <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
             <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>

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

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 70108f5..44c8288 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
@@ -11,8 +11,6 @@
         <module name="org.keycloak.keycloak-broker-saml" services="import"/>
         <module name="org.keycloak.keycloak-connections-http-client" services="import"/>
         <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-truststore" services="import"/>
@@ -20,7 +18,6 @@
         <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-events-jpa" services="import"/>
         <module name="org.keycloak.keycloak-events-mongo" services="import"/>
         <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
         <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>

events/pom.xml 1(+0 -1) 

diff --git a/events/pom.xml b/events/pom.xml
index 1290ce0..925b36b 100755
--- a/events/pom.xml
+++ b/events/pom.xml
@@ -17,7 +17,6 @@
 
     <modules>
         <module>email</module>
-        <module>jpa</module>
         <module>jboss-logging</module>
         <module>syslog</module>
         <module>mongo</module>

model/jpa/pom.xml 27(+23 -4) 

diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml
index fb0b31a..06ba7c6 100755
--- a/model/jpa/pom.xml
+++ b/model/jpa/pom.xml
@@ -28,12 +28,21 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-connections-jpa</artifactId>
+            <artifactId>keycloak-services</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-invalidation-cache-model</artifactId>
-            <scope>test</scope>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
@@ -61,6 +70,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

pom.xml 19(+2 -17) 

diff --git a/pom.xml b/pom.xml
index 433d836..bd65025 100755
--- a/pom.xml
+++ b/pom.xml
@@ -142,13 +142,13 @@
         <module>client-registration</module>
         <module>connections</module>
         <module>dependencies</module>
-        <module>events</module>
         <module>server-spi</module>
-        <module>model</module>
         <module>integration</module>
         <module>proxy</module>
         <module>federation</module>
         <module>services</module>
+        <module>model</module>
+        <module>events</module>
         <module>saml</module>
         <module>broker</module>
         <module>social</module>
@@ -622,16 +622,6 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-connections-jpa</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-connections-jpa-liquibase</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-connections-mongo</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -682,11 +672,6 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-events-jpa</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-events-mongo</artifactId>
                 <version>${project.version}</version>
             </dependency>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github