keycloak-uncached

Removed JPA model provider

7/8/2014 11:35:49 AM

Stian Thorgersen

Commit: 387aed6

Tree: ae9bbc4

Parents: 20bf888

Changes

export-import/export-import-impl/pom.xml 13(+0 -13)

export-import/export-import-impl/src/test/java/org/keycloak/exportimport/JPAToMongoExportImportTest.java 4(+4 -0)

export-import/export-import-impl/src/test/java/org/keycloak/exportimport/MongoToJPAExportImportTest.java 4(+4 -0)

model/jpa/pom.xml 139(+0 -139)

model/jpa/src/main/java/org/keycloak/models/jpa/ApplicationAdapter.java 268(+0 -268)

model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java 268(+0 -268)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/AbstractRoleMappingEntity.java 52(+0 -52)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/ApplicationEntity.java 90(+0 -90)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationLinkEntity.java 50(+0 -50)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationProviderEntity.java 80(+0 -80)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java 131(+0 -131)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientUserSessionAssociationEntity.java 84(+0 -84)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/CredentialEntity.java 91(+0 -91)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/OAuthClientEntity.java 27(+0 -27)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java 479(+0 -479)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentialEntity.java 64(+0 -64)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java 157(+0 -157)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/ScopeMappingEntity.java 60(+0 -60)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/SocialLinkEntity.java 86(+0 -86)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java 196(+0 -196)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/UsernameLoginFailureEntity.java 88(+0 -88)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java 19(+0 -19)

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

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

model/jpa/src/main/java/org/keycloak/models/jpa/JpaModelProvider.java 391(+0 -391)

model/jpa/src/main/java/org/keycloak/models/jpa/JpaModelProviderFactory.java 40(+0 -40)

model/jpa/src/main/java/org/keycloak/models/jpa/OAuthClientAdapter.java 56(+0 -56)

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

model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java 1145(+0 -1145)

model/jpa/src/main/java/org/keycloak/models/jpa/RoleAdapter.java 135(+0 -135)

model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java 384(+0 -384)

model/jpa/src/main/java/org/keycloak/models/jpa/UsernameLoginFailureAdapter.java 70(+0 -70)

model/jpa/src/main/java/org/keycloak/models/jpa/UserSessionAdapter.java 130(+0 -130)

model/jpa/src/main/java/org/keycloak/models/jpa/utils/JpaIdGenerator.java 19(+0 -19)

model/jpa/src/main/resources/META-INF/services/org.keycloak.models.ModelProviderFactory 1(+0 -1)

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

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

Details

export-import/export-import-impl/pom.xml 13(+0 -13)

diff --git a/export-import/export-import-impl/pom.xml b/export-import/export-import-impl/pom.xml
index 9b10c8a..683cfe9 100755
--- a/export-import/export-import-impl/pom.xml
+++ b/export-import/export-import-impl/pom.xml
@@ -103,19 +103,6 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-jpa</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-jpa</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-mongo</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

export-import/export-import-impl/src/test/java/org/keycloak/exportimport/JPAToMongoExportImportTest.java 4(+4 -0)

diff --git a/export-import/export-import-impl/src/test/java/org/keycloak/exportimport/JPAToMongoExportImportTest.java b/export-import/export-import-impl/src/test/java/org/keycloak/exportimport/JPAToMongoExportImportTest.java
index 8cc6a17..c1491d9 100644
--- a/export-import/export-import-impl/src/test/java/org/keycloak/exportimport/JPAToMongoExportImportTest.java
+++ b/export-import/export-import-impl/src/test/java/org/keycloak/exportimport/JPAToMongoExportImportTest.java
@@ -1,5 +1,6 @@
 package org.keycloak.exportimport;
 
+import org.junit.Ignore;
 import org.keycloak.exportimport.io.directory.TmpDirExportImportIOProvider;
 import org.keycloak.models.KeycloakSessionFactory;
 
@@ -7,7 +8,10 @@ import org.keycloak.models.KeycloakSessionFactory;
  * Test for full export of data from JPA and import them to Mongo. Using "directory" provider
  *
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ *
+ * TODO Update to work with hybrid model provider
  */
+@Ignore
 public class JPAToMongoExportImportTest extends ExportImportTestBase {
 
     @Override

export-import/export-import-impl/src/test/java/org/keycloak/exportimport/MongoToJPAExportImportTest.java 4(+4 -0)

diff --git a/export-import/export-import-impl/src/test/java/org/keycloak/exportimport/MongoToJPAExportImportTest.java b/export-import/export-import-impl/src/test/java/org/keycloak/exportimport/MongoToJPAExportImportTest.java
index 5fe08f7..0de953e 100644
--- a/export-import/export-import-impl/src/test/java/org/keycloak/exportimport/MongoToJPAExportImportTest.java
+++ b/export-import/export-import-impl/src/test/java/org/keycloak/exportimport/MongoToJPAExportImportTest.java
@@ -1,6 +1,7 @@
 package org.keycloak.exportimport;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.keycloak.exportimport.io.zip.EncryptedZIPIOProvider;
 import org.keycloak.models.KeycloakSessionFactory;
 
@@ -10,7 +11,10 @@ import java.io.File;
  * Test for full export of data from Mongo and import them to JPA. Using export into encrypted ZIP and import from it
  *
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ *
+ * TODO Update to work with hybrid model provider
  */
+@Ignore
 public class MongoToJPAExportImportTest extends ExportImportTestBase {
 
     private static final String zipFile = "keycloak-export.zip";

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

diff --git a/model/pom.xml b/model/pom.xml
index 5051547..9011480 100755
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -27,8 +27,6 @@
     <modules>
         <module>api</module>
         <module>invalidation-cache</module>
-        <!-- <module>picketlink</module> -->
-        <module>jpa</module>
         <module>mongo</module>
         <module>tests</module>