From 9b09a914810d99253c7a4d21d22680dcfd1404fb Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Tue, 19 Jan 2016 17:00:58 -0500 Subject: [PATCH] consolidate JPA --- connections/jpa-liquibase/pom.xml | 76 ------------------- connections/jpa/pom.xml | 36 --------- connections/pom.xml | 2 - dependencies/server-all/pom.xml | 12 --- dependencies/server-min/pom.xml | 4 - .../main/module.xml | 21 ----- .../keycloak-connections-jpa/main/module.xml | 24 ------ .../keycloak-events-jpa/main/module.xml | 25 ------ .../keycloak-model-jpa/main/module.xml | 1 - .../WEB-INF/jboss-deployment-structure.xml | 3 - .../keycloak-services/main/module.xml | 3 - events/jpa/pom.xml | 52 ------------- events/pom.xml | 1 - model/jpa/pom.xml | 27 ++++++- .../jpa/DefaultJpaConnectionProvider.java | 0 .../DefaultJpaConnectionProviderFactory.java | 0 .../jpa/JpaConnectionProvider.java | 0 .../jpa/JpaConnectionProviderFactory.java | 0 .../connections/jpa/JpaConnectionSpi.java | 0 .../jpa/JpaKeycloakTransaction.java | 0 .../jpa/PersistenceExceptionConverter.java | 0 .../jpa/updater/JpaUpdaterProvider.java | 0 .../updater/JpaUpdaterProviderFactory.java | 0 .../jpa/updater/JpaUpdaterSpi.java | 0 .../LiquibaseJpaUpdaterProvider.java | 0 .../LiquibaseJpaUpdaterProviderFactory.java | 0 .../liquibase/ThreadLocalSessionContext.java | 0 .../liquibase/custom/AddRealmCodeSecret.java | 0 .../liquibase/custom/CustomKeycloakTask.java | 0 .../custom/JpaUpdate1_2_0_Beta1.java | 0 .../liquibase/custom/JpaUpdate1_2_0_CR1.java | 0 .../custom/JpaUpdate1_4_0_Final.java | 0 .../connections/jpa/util/JpaUtils.java | 0 .../keycloak/events/jpa/AdminEventEntity.java | 0 .../org/keycloak/events/jpa/EventEntity.java | 0 .../events/jpa/JpaAdminEventQuery.java | 0 .../keycloak/events/jpa/JpaEventQuery.java | 0 .../events/jpa/JpaEventStoreProvider.java | 0 .../jpa/JpaEventStoreProviderFactory.java | 0 .../META-INF/jpa-changelog-1.0.0.Final.xml | 0 .../META-INF/jpa-changelog-1.1.0.Beta1.xml | 0 .../META-INF/jpa-changelog-1.1.0.Final.xml | 0 .../META-INF/jpa-changelog-1.2.0.Beta1.xml | 0 .../META-INF/jpa-changelog-1.2.0.CR1.xml | 0 .../META-INF/jpa-changelog-1.2.0.Final.xml | 0 .../META-INF/jpa-changelog-1.3.0.xml | 0 .../META-INF/jpa-changelog-1.4.0.xml | 0 .../META-INF/jpa-changelog-1.5.0.xml | 0 .../META-INF/jpa-changelog-1.6.0.xml | 0 .../META-INF/jpa-changelog-1.6.1.xml | 0 .../META-INF/jpa-changelog-1.7.0.xml | 0 .../META-INF/jpa-changelog-1.8.0.xml | 0 .../META-INF/jpa-changelog-master.xml | 0 .../main/resources/META-INF/persistence.xml | 0 ...nnections.jpa.JpaConnectionProviderFactory | 0 ...ions.jpa.updater.JpaUpdaterProviderFactory | 0 ....keycloak.events.EventStoreProviderFactory | 0 .../services/org.keycloak.provider.Spi | 0 pom.xml | 19 +---- 59 files changed, 25 insertions(+), 281 deletions(-) delete mode 100755 connections/jpa-liquibase/pom.xml delete mode 100755 connections/jpa/pom.xml delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml delete mode 100755 events/jpa/pom.xml rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java (100%) rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java (100%) rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java (100%) rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProviderFactory.java (100%) rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionSpi.java (100%) rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java (100%) rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/PersistenceExceptionConverter.java (100%) rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java (100%) rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProviderFactory.java (100%) rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterSpi.java (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProviderFactory.java (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/java/org/keycloak/connections/jpa/updater/liquibase/ThreadLocalSessionContext.java (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java (100%) rename {connections => model}/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java (100%) rename {events => model}/jpa/src/main/java/org/keycloak/events/jpa/AdminEventEntity.java (100%) rename {events => model}/jpa/src/main/java/org/keycloak/events/jpa/EventEntity.java (100%) rename {events => model}/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java (100%) rename {events => model}/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java (100%) rename {events => model}/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java (100%) rename {events => model}/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProviderFactory.java (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.1.0.Beta1.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.1.0.Final.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.2.0.Final.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.3.0.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.4.0.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.5.0.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.6.0.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.6.1.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.7.0.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-1.8.0.xml (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/jpa-changelog-master.xml (100%) rename {connections => model}/jpa/src/main/resources/META-INF/persistence.xml (100%) rename {connections => model}/jpa/src/main/resources/META-INF/services/org.keycloak.connections.jpa.JpaConnectionProviderFactory (100%) rename {connections/jpa-liquibase => model/jpa}/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory (100%) rename {events => model}/jpa/src/main/resources/META-INF/services/org.keycloak.events.EventStoreProviderFactory (100%) rename {connections => model}/jpa/src/main/resources/META-INF/services/org.keycloak.provider.Spi (100%) diff --git a/connections/jpa-liquibase/pom.xml b/connections/jpa-liquibase/pom.xml deleted file mode 100755 index 7c97307921..0000000000 --- a/connections/jpa-liquibase/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - keycloak-parent - org.keycloak - 1.9.0.CR1-SNAPSHOT - ../../pom.xml - - 4.0.0 - - keycloak-connections-jpa-liquibase - Keycloak Connections JPA Liquibase Updater - - - - - org.keycloak - keycloak-connections-jpa - - - org.keycloak - keycloak-server-spi - - - org.liquibase - liquibase-core - - - org.yaml - snakeyaml - - - - - org.jboss.logging - jboss-logging - - - org.keycloak - keycloak-services - - - com.h2database - h2 - - - - - - - org.liquibase - liquibase-maven-plugin - - META-INF/jpa-changelog-master.xml - - ${project.url} - ${driver} - ${username} - ${password} - - ${referenceUrl} - ${driver} - ${username} - ${password} - - - - - - - sa - - org.h2.Driver - - diff --git a/connections/jpa/pom.xml b/connections/jpa/pom.xml deleted file mode 100755 index a804699911..0000000000 --- a/connections/jpa/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - keycloak-parent - org.keycloak - 1.9.0.CR1-SNAPSHOT - ../../pom.xml - - 4.0.0 - - keycloak-connections-jpa - Keycloak Connections JPA - - - - - org.keycloak - keycloak-core - - - org.keycloak - keycloak-server-spi - - - org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} - provided - - - org.hibernate - hibernate-entitymanager - provided - - - diff --git a/connections/pom.xml b/connections/pom.xml index 3f83ab5186..ebecf04f23 100755 --- a/connections/pom.xml +++ b/connections/pom.xml @@ -13,8 +13,6 @@ pom - jpa - jpa-liquibase infinispan mongo mongo-update diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml index a503d53b87..9165b69321 100755 --- a/dependencies/server-all/pom.xml +++ b/dependencies/server-all/pom.xml @@ -20,14 +20,6 @@ keycloak-dependencies-server-min pom - - org.keycloak - keycloak-connections-jpa - - - org.keycloak - keycloak-connections-jpa-liquibase - org.keycloak keycloak-connections-infinispan @@ -44,10 +36,6 @@ org.keycloak keycloak-invalidation-cache-infinispan - - org.keycloak - keycloak-events-jpa - org.keycloak keycloak-events-jboss-logging diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml index 2c7a0f1fdc..edbbccfa69 100755 --- a/dependencies/server-min/pom.xml +++ b/dependencies/server-min/pom.xml @@ -47,10 +47,6 @@ org.keycloak keycloak-invalidation-cache-model - - org.keycloak - keycloak-events-jpa - org.keycloak keycloak-events-jboss-logging diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml deleted file mode 100755 index ec6a855e01..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml deleted file mode 100755 index 3d4996438f..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml deleted file mode 100755 index 2a6bc39f53..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 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 dbca1cafd7..523a6b5307 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 @@ - 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 cf81910a5d..ed602970ae 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 @@ - - @@ -11,7 +9,6 @@ - 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 70108f5a12..44c828879d 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 @@ - - @@ -20,7 +18,6 @@ - diff --git a/events/jpa/pom.xml b/events/jpa/pom.xml deleted file mode 100755 index 663002c3c0..0000000000 --- a/events/jpa/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - keycloak-events-parent - org.keycloak - 1.9.0.CR1-SNAPSHOT - - - 4.0.0 - - keycloak-events-jpa - Keycloak Events Store JPA Provider - - - - - org.keycloak - keycloak-core - provided - - - org.keycloak - keycloak-server-spi - provided - - - org.keycloak - keycloak-connections-jpa - provided - - - org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} - provided - - - org.hibernate - hibernate-entitymanager - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - diff --git a/events/pom.xml b/events/pom.xml index 1290ce0bbc..925b36bace 100755 --- a/events/pom.xml +++ b/events/pom.xml @@ -17,7 +17,6 @@ email - jpa jboss-logging syslog mongo diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml index fb0b31ade3..06ba7c6490 100755 --- a/model/jpa/pom.xml +++ b/model/jpa/pom.xml @@ -28,12 +28,21 @@ org.keycloak - keycloak-connections-jpa + keycloak-services - org.keycloak - keycloak-invalidation-cache-model - test + org.liquibase + liquibase-core + + + org.yaml + snakeyaml + + + + + com.h2database + h2 org.hibernate.javax.persistence @@ -61,6 +70,16 @@ + + com.fasterxml.jackson.core + jackson-databind + provided + + + com.fasterxml.jackson.core + jackson-core + provided + diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProviderFactory.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProviderFactory.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProviderFactory.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProviderFactory.java diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionSpi.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionSpi.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionSpi.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionSpi.java diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/PersistenceExceptionConverter.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/PersistenceExceptionConverter.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/PersistenceExceptionConverter.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/PersistenceExceptionConverter.java diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProviderFactory.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProviderFactory.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProviderFactory.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProviderFactory.java diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterSpi.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterSpi.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterSpi.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterSpi.java diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java similarity index 100% rename from connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProviderFactory.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProviderFactory.java similarity index 100% rename from connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProviderFactory.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProviderFactory.java diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/ThreadLocalSessionContext.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/ThreadLocalSessionContext.java similarity index 100% rename from connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/ThreadLocalSessionContext.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/ThreadLocalSessionContext.java diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java similarity index 100% rename from connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java similarity index 100% rename from connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java similarity index 100% rename from connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java similarity index 100% rename from connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java similarity index 100% rename from connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java diff --git a/connections/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java similarity index 100% rename from connections/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java rename to model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java diff --git a/events/jpa/src/main/java/org/keycloak/events/jpa/AdminEventEntity.java b/model/jpa/src/main/java/org/keycloak/events/jpa/AdminEventEntity.java similarity index 100% rename from events/jpa/src/main/java/org/keycloak/events/jpa/AdminEventEntity.java rename to model/jpa/src/main/java/org/keycloak/events/jpa/AdminEventEntity.java diff --git a/events/jpa/src/main/java/org/keycloak/events/jpa/EventEntity.java b/model/jpa/src/main/java/org/keycloak/events/jpa/EventEntity.java similarity index 100% rename from events/jpa/src/main/java/org/keycloak/events/jpa/EventEntity.java rename to model/jpa/src/main/java/org/keycloak/events/jpa/EventEntity.java diff --git a/events/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java similarity index 100% rename from events/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java rename to model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java diff --git a/events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java similarity index 100% rename from events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java rename to model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java diff --git a/events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java similarity index 100% rename from events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java rename to model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java diff --git a/events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProviderFactory.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProviderFactory.java similarity index 100% rename from events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProviderFactory.java rename to model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProviderFactory.java diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.1.0.Beta1.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.1.0.Beta1.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.1.0.Beta1.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.1.0.Beta1.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.1.0.Final.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.1.0.Final.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.1.0.Final.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.1.0.Final.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.Final.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Final.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.Final.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Final.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.3.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.3.0.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.3.0.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.3.0.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.4.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.4.0.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.4.0.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.4.0.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.5.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.5.0.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.5.0.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.5.0.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.6.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.6.0.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.6.0.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.6.0.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.6.1.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.6.1.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.6.1.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.6.1.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.7.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.7.0.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.7.0.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.7.0.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.8.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.8.0.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.8.0.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-1.8.0.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml rename to model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml diff --git a/connections/jpa/src/main/resources/META-INF/persistence.xml b/model/jpa/src/main/resources/META-INF/persistence.xml similarity index 100% rename from connections/jpa/src/main/resources/META-INF/persistence.xml rename to model/jpa/src/main/resources/META-INF/persistence.xml diff --git a/connections/jpa/src/main/resources/META-INF/services/org.keycloak.connections.jpa.JpaConnectionProviderFactory b/model/jpa/src/main/resources/META-INF/services/org.keycloak.connections.jpa.JpaConnectionProviderFactory similarity index 100% rename from connections/jpa/src/main/resources/META-INF/services/org.keycloak.connections.jpa.JpaConnectionProviderFactory rename to model/jpa/src/main/resources/META-INF/services/org.keycloak.connections.jpa.JpaConnectionProviderFactory diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory b/model/jpa/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory rename to model/jpa/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory diff --git a/events/jpa/src/main/resources/META-INF/services/org.keycloak.events.EventStoreProviderFactory b/model/jpa/src/main/resources/META-INF/services/org.keycloak.events.EventStoreProviderFactory similarity index 100% rename from events/jpa/src/main/resources/META-INF/services/org.keycloak.events.EventStoreProviderFactory rename to model/jpa/src/main/resources/META-INF/services/org.keycloak.events.EventStoreProviderFactory diff --git a/connections/jpa/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/model/jpa/src/main/resources/META-INF/services/org.keycloak.provider.Spi similarity index 100% rename from connections/jpa/src/main/resources/META-INF/services/org.keycloak.provider.Spi rename to model/jpa/src/main/resources/META-INF/services/org.keycloak.provider.Spi diff --git a/pom.xml b/pom.xml index 433d836e28..bd65025c25 100755 --- a/pom.xml +++ b/pom.xml @@ -142,13 +142,13 @@ client-registration connections dependencies - events server-spi - model integration proxy federation services + model + events saml broker social @@ -620,16 +620,6 @@ keycloak-connections-infinispan ${project.version} - - org.keycloak - keycloak-connections-jpa - ${project.version} - - - org.keycloak - keycloak-connections-jpa-liquibase - ${project.version} - org.keycloak keycloak-connections-mongo @@ -680,11 +670,6 @@ keycloak-events-jboss-logging ${project.version} - - org.keycloak - keycloak-events-jpa - ${project.version} - org.keycloak keycloak-events-mongo