Prosoft Git

keycloak-uncached

Merge pull request #53 from patriot1burke/master model …

10/2/2013 10:55:53 AM
Bill Burke

Bill Burke

Commit: 5943de4

Tree: da04146

Parents: 2fb61f5
a4e3431

Changes

examples/as7-eap-demo/server/pom.xml 10(+10 -0)

examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java 6(+2 -4)

examples/as7-eap-demo/server/src/main/resources/META-INF/persistence.xml 4(+2 -2)

forms/pom.xml 5(+5 -0)

forms/src/main/java/org/keycloak/forms/LoginBean.java 2(+1 -1)

forms/src/main/java/org/keycloak/forms/RealmBean.java 2(+1 -1)

forms/src/main/java/org/keycloak/forms/UserBean.java 2(+1 -1)

model/api/pom.xml 30(+30 -0)

model/api/src/main/java/org/keycloak/models/ApplicationModel.java 2(+1 -1)

model/api/src/main/java/org/keycloak/models/IdGenerator.java 15(+15 -0)

model/api/src/main/java/org/keycloak/models/KeycloakSession.java 2(+1 -1)

model/api/src/main/java/org/keycloak/models/KeycloakSessionFactory.java 2(+1 -1)

model/api/src/main/java/org/keycloak/models/KeycloakTransaction.java 2(+1 -1)

model/api/src/main/java/org/keycloak/models/RealmModel.java 2(+1 -1)

model/api/src/main/java/org/keycloak/models/RequiredCredentialModel.java 10(+4 -6)

model/api/src/main/java/org/keycloak/models/RoleModel.java 2(+1 -1)

model/api/src/main/java/org/keycloak/models/SocialLinkModel.java 2(+1 -1)

model/api/src/main/java/org/keycloak/models/UserCredentialModel.java 5(+4 -1)

model/api/src/main/java/org/keycloak/models/UserModel.java 2(+1 -1)

model/api/src/main/java/org/keycloak/models/utils/ArrayUtils.java 2(+1 -1)

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

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

model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentailEntity.java 2(+1 -1)

model/jpa/src/main/java/org/keycloak/models/jpa/entities/ResourceEntity.java 2(+1 -1)

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

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

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

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

model/picketlink/pom.xml 81(+81 -0)

model/picketlink/src/main/java/org/keycloak/models/picketlink/ApplicationAdapter.java 12(+6 -6)

model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/ApplicationData.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/ApplicationEntity.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/RealmData.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/RealmEntity.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakSession.java 29(+9 -20)

model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakSessionFactory.java 6(+3 -3)

model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakTransaction.java 4(+2 -2)

model/picketlink/src/main/java/org/keycloak/models/picketlink/RealmAdapter.java 35(+11 -24)

model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/OAuthClientRequiredCredentialRelationship.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RealmAdminRelationship.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RequiredApplicationCredentialRelationship.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RequiredCredentialRelationship.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/ResourceRelationship.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/ScopeRelationship.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/SocialLinkRelationship.java 2(+1 -1)

model/picketlink/src/main/java/org/keycloak/models/picketlink/RoleAdapter.java 4(+2 -2)

model/picketlink/src/main/java/org/keycloak/models/picketlink/UserAdapter.java 6(+3 -3)

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

pom.xml 1(+1 -0)

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

services/src/main/java/org/keycloak/services/email/EmailSender.java 4(+2 -2)

services/src/main/java/org/keycloak/services/filters/KeycloakSessionCleanupFilter.java 2(+1 -1)

services/src/main/java/org/keycloak/services/filters/KeycloakSessionCreateFilter.java 4(+2 -2)

services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java 6(+3 -3)

services/src/main/java/org/keycloak/services/FormService.java 4(+2 -2)

services/src/main/java/org/keycloak/services/managers/AccessCodeEntry.java 6(+3 -3)

services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java 6(+3 -3)

services/src/main/java/org/keycloak/services/managers/RealmManager.java 4(+2 -2)

services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java 4(+2 -2)

services/src/main/java/org/keycloak/services/managers/ResourceManager.java 2(+1 -1)

services/src/main/java/org/keycloak/services/managers/TokenManager.java 8(+4 -4)

services/src/main/java/org/keycloak/services/managers/UserManager.java 6(+3 -3)

services/src/main/java/org/keycloak/services/resources/AccountService.java 8(+4 -4)

services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java 2(+1 -1)

services/src/main/java/org/keycloak/services/resources/admin/ApplicationsResource.java 8(+4 -4)

services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java 11(+4 -7)

services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java 6(+3 -3)

services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java 2(+1 -1)

services/src/main/java/org/keycloak/services/resources/flows/Flows.java 2(+1 -1)

services/src/main/java/org/keycloak/services/resources/flows/FormFlows.java 6(+3 -3)

services/src/main/java/org/keycloak/services/resources/flows/OAuthFlows.java 8(+4 -4)

services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java 10(+5 -5)

services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java 2(+1 -1)

services/src/main/java/org/keycloak/services/resources/RealmsResource.java 4(+2 -2)

services/src/main/java/org/keycloak/services/resources/SaasService.java 3(+1 -2)

services/src/main/java/org/keycloak/services/resources/SocialResource.java 4(+1 -3)

services/src/main/java/org/keycloak/services/resources/TokenService.java 5(+2 -3)

services/src/main/java/org/keycloak/services/resources/Transaction.java 4(+2 -2)

services/src/test/java/org/keycloak/services/managers/AuthenticationManagerTest.java 12(+6 -6)

services/src/test/java/org/keycloak/services/models/utils/ArrayUtilsTest.java 35(+0 -35)

services/src/test/java/org/keycloak/test/AdapterTest.java 18(+8 -10)

services/src/test/java/org/keycloak/test/ImportTest.java 16(+8 -8)

services/src/test/java/org/keycloak/test/InstallationManager.java 4(+1 -3)

services/src/test/java/org/keycloak/test/ModelTest.java 8(+4 -4)

services/src/test/java/org/keycloak/test/RealmCreationTest.java 4(+2 -2)

services/src/test/resources/META-INF/persistence.xml 4(+2 -2)

testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java 6(+3 -3)

testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java 6(+3 -3)

testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java 6(+3 -3)

testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java 6(+3 -3)

testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java 6(+3 -3)

testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java 6(+3 -3)

testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java 6(+3 -3)

testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java 10(+5 -5)

testsuite/src/test/java/org/keycloak/testsuite/social/SocialLoginTest.java 2(+1 -1)

testsuite/src/test/resources/META-INF/persistence.xml 4(+2 -2)

Details

examples/as7-eap-demo/server/pom.xml 10(+10 -0) 

diff --git a/examples/as7-eap-demo/server/pom.xml b/examples/as7-eap-demo/server/pom.xml
index 00d3dae..36d7cf8 100755
--- a/examples/as7-eap-demo/server/pom.xml
+++ b/examples/as7-eap-demo/server/pom.xml
@@ -32,6 +32,16 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-picketlink</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-social-core</artifactId>
             <version>${project.version}</version>
         </dependency>

examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java 6(+2 -4) 

diff --git a/examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java b/examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java
index b7c11f2..2103030 100755
--- a/examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java
+++ b/examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java
@@ -4,12 +4,10 @@ import org.jboss.resteasy.jwt.JsonSerialization;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.RequiredCredentialModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
 import org.keycloak.services.resources.KeycloakApplication;
 import org.keycloak.services.resources.SaasService;
-import org.keycloak.services.resources.SaasService;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.core.Context;

examples/as7-eap-demo/server/src/main/resources/META-INF/persistence.xml 4(+2 -2) 

diff --git a/examples/as7-eap-demo/server/src/main/resources/META-INF/persistence.xml b/examples/as7-eap-demo/server/src/main/resources/META-INF/persistence.xml
index ad40046..cb5a1c3 100755
--- a/examples/as7-eap-demo/server/src/main/resources/META-INF/persistence.xml
+++ b/examples/as7-eap-demo/server/src/main/resources/META-INF/persistence.xml
@@ -18,8 +18,8 @@
         <class>org.picketlink.idm.jpa.model.sample.simple.X509CredentialTypeEntity</class>
         <class>org.picketlink.idm.jpa.model.sample.simple.OTPCredentialTypeEntity</class>
         <class>org.picketlink.idm.jpa.model.sample.simple.AttributeTypeEntity</class>
-        <class>org.keycloak.services.models.picketlink.mappings.RealmEntity</class>
-        <class>org.keycloak.services.models.picketlink.mappings.ApplicationEntity</class>
+        <class>org.keycloak.models.picketlink.mappings.RealmEntity</class>
+        <class>org.keycloak.models.picketlink.mappings.ApplicationEntity</class>
 
         <exclude-unlisted-classes>true</exclude-unlisted-classes>

forms/pom.xml 5(+5 -0) 

diff --git a/forms/pom.xml b/forms/pom.xml
index 0ad2957..6d0dec8 100755
--- a/forms/pom.xml
+++ b/forms/pom.xml
@@ -18,6 +18,11 @@
 			<artifactId>keycloak-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>org.keycloak</groupId>
 			<artifactId>keycloak-services</artifactId>

forms/src/main/java/org/keycloak/forms/LoginBean.java 2(+1 -1) 

diff --git a/forms/src/main/java/org/keycloak/forms/LoginBean.java b/forms/src/main/java/org/keycloak/forms/LoginBean.java
old mode 100644
new mode 100755
index 5777e91..9174813
--- a/forms/src/main/java/org/keycloak/forms/LoginBean.java
+++ b/forms/src/main/java/org/keycloak/forms/LoginBean.java
@@ -51,7 +51,7 @@ public class LoginBean {
         }
 
         requiredCredentials = new LinkedList<RequiredCredential>();
-        for (org.keycloak.services.models.RequiredCredentialModel c : realm.getRealm().getRequiredCredentials()) {
+        for (org.keycloak.models.RequiredCredentialModel c : realm.getRealm().getRequiredCredentials()) {
             if (c.isInput()) {
                 requiredCredentials.add(new RequiredCredential(c.getType(), c.isSecret(), c.getFormLabel()));
             }

forms/src/main/java/org/keycloak/forms/RealmBean.java 2(+1 -1) 

diff --git a/forms/src/main/java/org/keycloak/forms/RealmBean.java b/forms/src/main/java/org/keycloak/forms/RealmBean.java
old mode 100644
new mode 100755
index e799b7a..c922638
--- a/forms/src/main/java/org/keycloak/forms/RealmBean.java
+++ b/forms/src/main/java/org/keycloak/forms/RealmBean.java
@@ -21,7 +21,7 @@
  */
 package org.keycloak.forms;
 
-import org.keycloak.services.models.RealmModel;
+import org.keycloak.models.RealmModel;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

forms/src/main/java/org/keycloak/forms/UserBean.java 2(+1 -1) 

diff --git a/forms/src/main/java/org/keycloak/forms/UserBean.java b/forms/src/main/java/org/keycloak/forms/UserBean.java
old mode 100644
new mode 100755
index 97fe839..019adb2
--- a/forms/src/main/java/org/keycloak/forms/UserBean.java
+++ b/forms/src/main/java/org/keycloak/forms/UserBean.java
@@ -21,7 +21,7 @@
  */
 package org.keycloak.forms;
 
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.UserModel;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

model/api/pom.xml 30(+30 -0) 

diff --git a/model/api/pom.xml b/model/api/pom.xml
new file mode 100755
index 0000000..48e4ac9
--- /dev/null
+++ b/model/api/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<project>
+    <parent>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>1.0-alpha-1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>keycloak-model-api</artifactId>
+    <name>Keycloak Model API</name>
+    <description/>
+
+    <dependencies>
+   </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

model/api/src/main/java/org/keycloak/models/IdGenerator.java 15(+15 -0) 

diff --git a/model/api/src/main/java/org/keycloak/models/IdGenerator.java b/model/api/src/main/java/org/keycloak/models/IdGenerator.java
new file mode 100755
index 0000000..3a1b028
--- /dev/null
+++ b/model/api/src/main/java/org/keycloak/models/IdGenerator.java
@@ -0,0 +1,15 @@
+package org.keycloak.models;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class IdGenerator {
+    private static AtomicLong counter = new AtomicLong(1);
+    public static String generateId() {
+        return counter.getAndIncrement() + "-" + System.currentTimeMillis();
+    }
+
+}

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

diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml
new file mode 100755
index 0000000..8f6edf9
--- /dev/null
+++ b/model/jpa/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<project>
+    <parent>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>1.0-alpha-1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>keycloak-model-jpa</artifactId>
+    <name>Keycloak Model JPA</name>
+    <description/>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.0-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

model/picketlink/pom.xml 81(+81 -0) 

diff --git a/model/picketlink/pom.xml b/model/picketlink/pom.xml
new file mode 100755
index 0000000..a035b19
--- /dev/null
+++ b/model/picketlink/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<project>
+    <parent>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>1.0-alpha-1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>keycloak-model-picketlink</artifactId>
+    <name>Keycloak Model Picketlink</name>
+    <description/>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-idm-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-idm-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-idm-simple-schema</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-config</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.0-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

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

diff --git a/model/pom.xml b/model/pom.xml
new file mode 100755
index 0000000..c6a4a9e
--- /dev/null
+++ b/model/pom.xml
@@ -0,0 +1,41 @@
+<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>
+        <groupId>org.keycloak</groupId>
+        <version>1.0-alpha-1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <name>Examples</name>
+    <description/>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.keycloak</groupId>
+    <artifactId>keycloak-model-pom</artifactId>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jboss.as.plugins</groupId>
+                <artifactId>jboss-as-maven-plugin</artifactId>
+                <version>7.1.1.Final</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <modules>
+        <module>api</module>
+        <module>picketlink</module>
+        <module>jpa</module>
+    </modules>
+</project>

pom.xml 1(+1 -0) 

diff --git a/pom.xml b/pom.xml
index e844793..4600d51 100755
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,7 @@
 
     <modules>
         <module>core</module>
+        <module>model</module>
         <module>services</module>
         <module>integration</module>
         <module>social</module>

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

diff --git a/services/pom.xml b/services/pom.xml
index dce0df7..4d8075f 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -26,6 +26,16 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-picketlink</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-social-core</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

services/src/main/java/org/keycloak/services/email/EmailSender.java 4(+2 -2) 

diff --git a/services/src/main/java/org/keycloak/services/email/EmailSender.java b/services/src/main/java/org/keycloak/services/email/EmailSender.java
old mode 100644
new mode 100755
index 7fb20eb..93f59f9
--- a/services/src/main/java/org/keycloak/services/email/EmailSender.java
+++ b/services/src/main/java/org/keycloak/services/email/EmailSender.java
@@ -38,8 +38,8 @@ import javax.ws.rs.core.UriInfo;
 
 import org.jboss.resteasy.logging.Logger;
 import org.keycloak.services.managers.AccessCodeEntry;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserModel;
 import org.keycloak.services.resources.AccountService;
 import org.keycloak.services.resources.flows.Urls;

services/src/main/java/org/keycloak/services/filters/KeycloakSessionCleanupFilter.java 2(+1 -1) 

diff --git a/services/src/main/java/org/keycloak/services/filters/KeycloakSessionCleanupFilter.java b/services/src/main/java/org/keycloak/services/filters/KeycloakSessionCleanupFilter.java
index 126ef12..6269b90 100755
--- a/services/src/main/java/org/keycloak/services/filters/KeycloakSessionCleanupFilter.java
+++ b/services/src/main/java/org/keycloak/services/filters/KeycloakSessionCleanupFilter.java
@@ -2,7 +2,7 @@ package org.keycloak.services.filters;
 
 import org.jboss.resteasy.logging.Logger;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.keycloak.services.models.KeycloakSession;
+import org.keycloak.models.KeycloakSession;
 
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;

services/src/main/java/org/keycloak/services/filters/KeycloakSessionCreateFilter.java 4(+2 -2) 

diff --git a/services/src/main/java/org/keycloak/services/filters/KeycloakSessionCreateFilter.java b/services/src/main/java/org/keycloak/services/filters/KeycloakSessionCreateFilter.java
index a72101a..11cd46c 100755
--- a/services/src/main/java/org/keycloak/services/filters/KeycloakSessionCreateFilter.java
+++ b/services/src/main/java/org/keycloak/services/filters/KeycloakSessionCreateFilter.java
@@ -2,8 +2,8 @@ package org.keycloak.services.filters;
 
 import org.jboss.resteasy.logging.Logger;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.KeycloakSessionFactory;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
 
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;

services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java 6(+3 -3) 

diff --git a/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java b/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java
index 6506300..d662661 100755
--- a/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java
+++ b/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java
@@ -1,9 +1,9 @@
 package org.keycloak.services.filters;
 
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.KeycloakSessionFactory;
-import org.keycloak.services.models.KeycloakTransaction;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.models.KeycloakTransaction;
 
 import javax.servlet.*;
 import java.io.IOException;

services/src/main/java/org/keycloak/services/FormService.java 4(+2 -2) 

diff --git a/services/src/main/java/org/keycloak/services/FormService.java b/services/src/main/java/org/keycloak/services/FormService.java
old mode 100644
new mode 100755
index 50a0959..a70e457
--- a/services/src/main/java/org/keycloak/services/FormService.java
+++ b/services/src/main/java/org/keycloak/services/FormService.java
@@ -25,8 +25,8 @@ import java.net.URI;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserModel;
 import org.keycloak.services.resources.flows.FormFlows;
 
 /**

services/src/main/java/org/keycloak/services/managers/AccessCodeEntry.java 6(+3 -3) 

diff --git a/services/src/main/java/org/keycloak/services/managers/AccessCodeEntry.java b/services/src/main/java/org/keycloak/services/managers/AccessCodeEntry.java
index ce80497..fd1189f 100755
--- a/services/src/main/java/org/keycloak/services/managers/AccessCodeEntry.java
+++ b/services/src/main/java/org/keycloak/services/managers/AccessCodeEntry.java
@@ -1,9 +1,9 @@
 package org.keycloak.services.managers;
 
 import org.keycloak.representations.SkeletonKeyToken;
-import org.keycloak.services.models.RoleModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.RoleModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserModel.RequiredAction;
 
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;

services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java 6(+3 -3) 

diff --git a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java
index a0c10e9..6192e0f 100755
--- a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java
@@ -9,9 +9,9 @@ import org.keycloak.RSATokenVerifier;
 import org.keycloak.VerificationException;
 import org.keycloak.representations.SkeletonKeyToken;
 import org.keycloak.representations.idm.CredentialRepresentation;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.RequiredCredentialModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RequiredCredentialModel;
+import org.keycloak.models.UserModel;
 import org.keycloak.services.resources.RealmsResource;
 import org.keycloak.services.resources.SaasService;

services/src/main/java/org/keycloak/services/managers/RealmManager.java 4(+2 -2) 

diff --git a/services/src/main/java/org/keycloak/services/managers/RealmManager.java b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
index 5762c7b..cc5cb2f 100755
--- a/services/src/main/java/org/keycloak/services/managers/RealmManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
@@ -1,9 +1,9 @@
 package org.keycloak.services.managers;
 
 import org.jboss.resteasy.logging.Logger;
+import org.keycloak.models.*;
 import org.keycloak.representations.idm.*;
-import org.keycloak.services.models.*;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.UserModel.RequiredAction;
 
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;

services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java 4(+2 -2) 

diff --git a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java
index fd06088..c3de829 100755
--- a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java
@@ -5,8 +5,8 @@ import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.logging.Logger;
 import org.keycloak.TokenIdGenerator;
 import org.keycloak.representations.idm.admin.LogoutAction;
-import org.keycloak.services.models.ApplicationModel;
-import org.keycloak.services.models.RealmModel;
+import org.keycloak.models.ApplicationModel;
+import org.keycloak.models.RealmModel;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Form;

services/src/main/java/org/keycloak/services/managers/ResourceManager.java 2(+1 -1) 

diff --git a/services/src/main/java/org/keycloak/services/managers/ResourceManager.java b/services/src/main/java/org/keycloak/services/managers/ResourceManager.java
index 5da6c8c..a4d981c 100755
--- a/services/src/main/java/org/keycloak/services/managers/ResourceManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/ResourceManager.java
@@ -1,7 +1,7 @@
 package org.keycloak.services.managers;
 
+import org.keycloak.models.*;
 import org.keycloak.representations.idm.*;
-import org.keycloak.services.models.*;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

services/src/main/java/org/keycloak/services/managers/TokenManager.java 8(+4 -4) 

diff --git a/services/src/main/java/org/keycloak/services/managers/TokenManager.java b/services/src/main/java/org/keycloak/services/managers/TokenManager.java
index 3831ce4..60e3a98 100755
--- a/services/src/main/java/org/keycloak/services/managers/TokenManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/TokenManager.java
@@ -5,10 +5,10 @@ import org.jboss.resteasy.jose.jws.JWSBuilder;
 import org.jboss.resteasy.jwt.JsonSerialization;
 import org.keycloak.representations.SkeletonKeyScope;
 import org.keycloak.representations.SkeletonKeyToken;
-import org.keycloak.services.models.ApplicationModel;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.RoleModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.ApplicationModel;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RoleModel;
+import org.keycloak.models.UserModel;
 
 import javax.ws.rs.core.MultivaluedMap;
 import java.io.IOException;

services/src/main/java/org/keycloak/services/managers/UserManager.java 6(+3 -3) 

diff --git a/services/src/main/java/org/keycloak/services/managers/UserManager.java b/services/src/main/java/org/keycloak/services/managers/UserManager.java
index 49cd813..4d7a7ec 100755
--- a/services/src/main/java/org/keycloak/services/managers/UserManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/UserManager.java
@@ -2,9 +2,9 @@ package org.keycloak.services.managers;
 
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserCredentialModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserCredentialModel;
+import org.keycloak.models.UserModel;
 
 import java.util.Map;

services/src/main/java/org/keycloak/services/resources/AccountService.java 8(+4 -4) 

diff --git a/services/src/main/java/org/keycloak/services/resources/AccountService.java b/services/src/main/java/org/keycloak/services/resources/AccountService.java
index cfbdefa..8ca1511 100755
--- a/services/src/main/java/org/keycloak/services/resources/AccountService.java
+++ b/services/src/main/java/org/keycloak/services/resources/AccountService.java
@@ -46,10 +46,10 @@ import org.keycloak.services.managers.AccessCodeEntry;
 import org.keycloak.services.managers.AuthenticationManager;
 import org.keycloak.services.managers.TokenManager;
 import org.keycloak.services.messages.Messages;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserCredentialModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserCredentialModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.keycloak.services.resources.flows.Flows;
 import org.keycloak.services.resources.flows.FormFlows;
 import org.keycloak.services.validation.Validation;

services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java 2(+1 -1) 

diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java
index 582ebae..cb73b0c 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java
@@ -2,11 +2,11 @@ package org.keycloak.services.resources.admin;
 
 import org.jboss.resteasy.annotations.cache.NoCache;
 import org.jboss.resteasy.logging.Logger;
+import org.keycloak.models.*;
 import org.keycloak.representations.idm.ApplicationRepresentation;
 import org.keycloak.representations.idm.RoleRepresentation;
 import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.managers.ResourceManager;
-import org.keycloak.services.models.*;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.Context;

services/src/main/java/org/keycloak/services/resources/admin/ApplicationsResource.java 8(+4 -4) 

diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ApplicationsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ApplicationsResource.java
index 549c4c1..a8a8afe 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/ApplicationsResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/ApplicationsResource.java
@@ -5,10 +5,10 @@ import org.jboss.resteasy.logging.Logger;
 import org.keycloak.representations.idm.ApplicationRepresentation;
 import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.managers.ResourceManager;
-import org.keycloak.services.models.ApplicationModel;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.ApplicationModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserModel;
 
 import javax.ws.rs.*;
 import javax.ws.rs.container.ResourceContext;

services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java 11(+4 -7) 

diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
index 1974324..97249dd 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
@@ -4,12 +4,11 @@ import org.jboss.resteasy.annotations.cache.NoCache;
 import org.jboss.resteasy.logging.Logger;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.representations.idm.RoleRepresentation;
-import org.keycloak.representations.idm.UserRepresentation;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.RoleModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RoleModel;
+import org.keycloak.models.UserModel;
 
 import javax.ws.rs.*;
 import javax.ws.rs.container.ResourceContext;
@@ -17,9 +16,7 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java 6(+3 -3) 

diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java
index dc3b512..b64fcfe 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java
@@ -4,9 +4,9 @@ import org.jboss.resteasy.annotations.cache.NoCache;
 import org.jboss.resteasy.logging.Logger;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserModel;
 import org.keycloak.services.resources.SaasService;
 
 import javax.ws.rs.*;

services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java 2(+1 -1) 

diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
index 1f06b02..dec1721 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
@@ -2,9 +2,9 @@ package org.keycloak.services.resources.admin;
 
 import org.jboss.resteasy.annotations.cache.NoCache;
 import org.jboss.resteasy.logging.Logger;
+import org.keycloak.models.*;
 import org.keycloak.representations.idm.*;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.*;
 
 import javax.ws.rs.*;
 import javax.ws.rs.container.ResourceContext;

services/src/main/java/org/keycloak/services/resources/flows/Flows.java 2(+1 -1) 

diff --git a/services/src/main/java/org/keycloak/services/resources/flows/Flows.java b/services/src/main/java/org/keycloak/services/resources/flows/Flows.java
index a466f84..ddb1afe 100755
--- a/services/src/main/java/org/keycloak/services/resources/flows/Flows.java
+++ b/services/src/main/java/org/keycloak/services/resources/flows/Flows.java
@@ -24,7 +24,7 @@ package org.keycloak.services.resources.flows;
 import org.jboss.resteasy.spi.HttpRequest;
 import org.keycloak.services.managers.AuthenticationManager;
 import org.keycloak.services.managers.TokenManager;
-import org.keycloak.services.models.RealmModel;
+import org.keycloak.models.RealmModel;
 
 import javax.ws.rs.core.UriInfo;

services/src/main/java/org/keycloak/services/resources/flows/FormFlows.java 6(+3 -3) 

diff --git a/services/src/main/java/org/keycloak/services/resources/flows/FormFlows.java b/services/src/main/java/org/keycloak/services/resources/flows/FormFlows.java
index aac8260..d45588a 100755
--- a/services/src/main/java/org/keycloak/services/resources/flows/FormFlows.java
+++ b/services/src/main/java/org/keycloak/services/resources/flows/FormFlows.java
@@ -29,9 +29,9 @@ import org.jboss.resteasy.spi.ResteasyUriInfo;
 import org.keycloak.services.FormService;
 import org.keycloak.services.email.EmailSender;
 import org.keycloak.services.managers.AccessCodeEntry;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.picketlink.idm.model.sample.Realm;
 
 import javax.imageio.spi.ServiceRegistry;

services/src/main/java/org/keycloak/services/resources/flows/OAuthFlows.java 8(+4 -4) 

diff --git a/services/src/main/java/org/keycloak/services/resources/flows/OAuthFlows.java b/services/src/main/java/org/keycloak/services/resources/flows/OAuthFlows.java
index 25ba3d8..dafc11a 100755
--- a/services/src/main/java/org/keycloak/services/resources/flows/OAuthFlows.java
+++ b/services/src/main/java/org/keycloak/services/resources/flows/OAuthFlows.java
@@ -30,10 +30,10 @@ import org.keycloak.services.managers.AccessCodeEntry;
 import org.keycloak.services.managers.AuthenticationManager;
 import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.managers.TokenManager;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.RoleModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RoleModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.keycloak.services.resources.TokenService;
 
 import javax.ws.rs.core.Response;

services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java 10(+5 -5) 

diff --git a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
index 104803c..49855b9 100755
--- a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
+++ b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
@@ -2,11 +2,11 @@ package org.keycloak.services.resources;
 
 import org.keycloak.SkeletonKeyContextResolver;
 import org.keycloak.services.managers.TokenManager;
-import org.keycloak.services.models.KeycloakSessionFactory;
-import org.keycloak.services.models.picketlink.PicketlinkKeycloakSession;
-import org.keycloak.services.models.picketlink.PicketlinkKeycloakSessionFactory;
-import org.keycloak.services.models.picketlink.mappings.ApplicationEntity;
-import org.keycloak.services.models.picketlink.mappings.RealmEntity;
+import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.models.picketlink.PicketlinkKeycloakSession;
+import org.keycloak.models.picketlink.PicketlinkKeycloakSessionFactory;
+import org.keycloak.models.picketlink.mappings.ApplicationEntity;
+import org.keycloak.models.picketlink.mappings.RealmEntity;
 import org.keycloak.social.SocialRequestManager;
 import org.picketlink.idm.PartitionManager;
 import org.picketlink.idm.config.IdentityConfigurationBuilder;

services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java 2(+1 -1) 

diff --git a/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java b/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java
index e5550a0..03b7d5f 100755
--- a/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java
@@ -3,7 +3,7 @@ package org.keycloak.services.resources;
 import org.jboss.resteasy.annotations.cache.NoCache;
 import org.jboss.resteasy.logging.Logger;
 import org.keycloak.representations.idm.PublishedRealmRepresentation;
-import org.keycloak.services.models.RealmModel;
+import org.keycloak.models.RealmModel;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

services/src/main/java/org/keycloak/services/resources/RealmsResource.java 4(+2 -2) 

diff --git a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java
index a17537f..9914622 100755
--- a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java
@@ -3,8 +3,8 @@ package org.keycloak.services.resources;
 import org.jboss.resteasy.logging.Logger;
 import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.managers.TokenManager;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.RealmModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
 
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.Path;

services/src/main/java/org/keycloak/services/resources/SaasService.java 3(+1 -2) 

diff --git a/services/src/main/java/org/keycloak/services/resources/SaasService.java b/services/src/main/java/org/keycloak/services/resources/SaasService.java
index c559833..64e3d13 100755
--- a/services/src/main/java/org/keycloak/services/resources/SaasService.java
+++ b/services/src/main/java/org/keycloak/services/resources/SaasService.java
@@ -5,13 +5,13 @@ import org.jboss.resteasy.logging.Logger;
 import org.jboss.resteasy.spi.HttpRequest;
 import org.jboss.resteasy.spi.HttpResponse;
 import org.jboss.resteasy.spi.NotImplementedYetException;
+import org.keycloak.models.*;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
 import org.keycloak.services.managers.AuthenticationManager;
 import org.keycloak.services.managers.AuthenticationManager.AuthenticationStatus;
 import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.messages.Messages;
-import org.keycloak.services.models.*;
 import org.keycloak.services.resources.admin.RealmsAdminResource;
 import org.keycloak.services.resources.flows.Flows;
 import org.keycloak.services.validation.Validation;
@@ -23,7 +23,6 @@ import javax.ws.rs.core.*;
 import java.net.URI;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.StringTokenizer;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

services/src/main/java/org/keycloak/services/resources/SocialResource.java 4(+1 -3) 

diff --git a/services/src/main/java/org/keycloak/services/resources/SocialResource.java b/services/src/main/java/org/keycloak/services/resources/SocialResource.java
index 18e3da6..c13eb25 100755
--- a/services/src/main/java/org/keycloak/services/resources/SocialResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/SocialResource.java
@@ -32,7 +32,6 @@ import java.util.UUID;
 import javax.imageio.spi.ServiceRegistry;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -52,11 +51,10 @@ import org.jboss.resteasy.logging.Logger;
 import org.jboss.resteasy.specimpl.MultivaluedMapImpl;
 import org.jboss.resteasy.spi.HttpRequest;
 import org.jboss.resteasy.spi.HttpResponse;
+import org.keycloak.models.*;
 import org.keycloak.services.managers.AuthenticationManager;
 import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.managers.TokenManager;
-import org.keycloak.services.messages.Messages;
-import org.keycloak.services.models.*;
 import org.keycloak.services.resources.flows.Flows;
 import org.keycloak.services.resources.flows.OAuthFlows;
 import org.keycloak.services.resources.flows.PageFlows;

services/src/main/java/org/keycloak/services/resources/TokenService.java 5(+2 -3) 

diff --git a/services/src/main/java/org/keycloak/services/resources/TokenService.java b/services/src/main/java/org/keycloak/services/resources/TokenService.java
index ec7410a..0a80d02 100755
--- a/services/src/main/java/org/keycloak/services/resources/TokenService.java
+++ b/services/src/main/java/org/keycloak/services/resources/TokenService.java
@@ -8,6 +8,7 @@ import org.jboss.resteasy.jwt.JsonSerialization;
 import org.jboss.resteasy.logging.Logger;
 import org.jboss.resteasy.spi.HttpRequest;
 import org.jboss.resteasy.spi.HttpResponse;
+import org.keycloak.models.*;
 import org.keycloak.representations.AccessTokenResponse;
 import org.keycloak.representations.SkeletonKeyToken;
 import org.keycloak.representations.idm.CredentialRepresentation;
@@ -18,8 +19,7 @@ import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.managers.ResourceAdminManager;
 import org.keycloak.services.managers.TokenManager;
 import org.keycloak.services.messages.Messages;
-import org.keycloak.services.models.*;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.keycloak.services.resources.flows.Flows;
 import org.keycloak.services.resources.flows.OAuthFlows;
 import org.keycloak.services.validation.Validation;
@@ -46,7 +46,6 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.StringTokenizer;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

services/src/main/java/org/keycloak/services/resources/Transaction.java 4(+2 -2) 

diff --git a/services/src/main/java/org/keycloak/services/resources/Transaction.java b/services/src/main/java/org/keycloak/services/resources/Transaction.java
index 6918842..47d0570 100755
--- a/services/src/main/java/org/keycloak/services/resources/Transaction.java
+++ b/services/src/main/java/org/keycloak/services/resources/Transaction.java
@@ -1,8 +1,8 @@
 package org.keycloak.services.resources;
 
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.KeycloakTransaction;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakTransaction;
 
 /**
  * Meant to be used as an inner class wrapper (I forget the pattern name, its been awhile).

services/src/test/java/org/keycloak/services/managers/AuthenticationManagerTest.java 12(+6 -6) 

diff --git a/services/src/test/java/org/keycloak/services/managers/AuthenticationManagerTest.java b/services/src/test/java/org/keycloak/services/managers/AuthenticationManagerTest.java
old mode 100644
new mode 100755
index 76870e0..ce3ed3d
--- a/services/src/test/java/org/keycloak/services/managers/AuthenticationManagerTest.java
+++ b/services/src/test/java/org/keycloak/services/managers/AuthenticationManagerTest.java
@@ -11,12 +11,12 @@ import org.junit.Before;
 import org.junit.Test;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.services.managers.AuthenticationManager.AuthenticationStatus;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.KeycloakSessionFactory;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserCredentialModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserCredentialModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.keycloak.services.resources.KeycloakApplication;
 import org.picketlink.idm.credential.util.TimeBasedOTP;

services/src/test/java/org/keycloak/test/AdapterTest.java 18(+8 -10) 

diff --git a/services/src/test/java/org/keycloak/test/AdapterTest.java b/services/src/test/java/org/keycloak/test/AdapterTest.java
index 581c1e8..ec92f41 100755
--- a/services/src/test/java/org/keycloak/test/AdapterTest.java
+++ b/services/src/test/java/org/keycloak/test/AdapterTest.java
@@ -8,20 +8,18 @@ import org.junit.Test;
 import org.junit.runners.MethodSorters;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.KeycloakSessionFactory;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.RequiredCredentialModel;
-import org.keycloak.services.models.RoleModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserCredentialModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RequiredCredentialModel;
+import org.keycloak.models.RoleModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserCredentialModel;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.keycloak.services.resources.KeycloakApplication;
 
 
-import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;

services/src/test/java/org/keycloak/test/ImportTest.java 16(+8 -8) 

diff --git a/services/src/test/java/org/keycloak/test/ImportTest.java b/services/src/test/java/org/keycloak/test/ImportTest.java
index 1a5f0a0..4b77a62 100755
--- a/services/src/test/java/org/keycloak/test/ImportTest.java
+++ b/services/src/test/java/org/keycloak/test/ImportTest.java
@@ -9,14 +9,14 @@ import org.junit.runners.MethodSorters;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.KeycloakSessionFactory;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.RequiredCredentialModel;
-import org.keycloak.services.models.ApplicationModel;
-import org.keycloak.services.models.RoleModel;
-import org.keycloak.services.models.SocialLinkModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RequiredCredentialModel;
+import org.keycloak.models.ApplicationModel;
+import org.keycloak.models.RoleModel;
+import org.keycloak.models.SocialLinkModel;
+import org.keycloak.models.UserModel;
 import org.keycloak.services.resources.KeycloakApplication;
 import org.keycloak.services.resources.SaasService;

services/src/test/java/org/keycloak/test/InstallationManager.java 4(+1 -3) 

diff --git a/services/src/test/java/org/keycloak/test/InstallationManager.java b/services/src/test/java/org/keycloak/test/InstallationManager.java
index 64c3c21..1b1a686 100755
--- a/services/src/test/java/org/keycloak/test/InstallationManager.java
+++ b/services/src/test/java/org/keycloak/test/InstallationManager.java
@@ -2,9 +2,7 @@ package org.keycloak.test;
 
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.RequiredCredentialModel;
-import org.keycloak.services.resources.SaasService;
+import org.keycloak.models.RealmModel;
 import org.keycloak.services.resources.SaasService;
 
 /**

services/src/test/java/org/keycloak/test/ModelTest.java 8(+4 -4) 

diff --git a/services/src/test/java/org/keycloak/test/ModelTest.java b/services/src/test/java/org/keycloak/test/ModelTest.java
old mode 100644
new mode 100755
index 62fa870..a75fa76
--- a/services/src/test/java/org/keycloak/test/ModelTest.java
+++ b/services/src/test/java/org/keycloak/test/ModelTest.java
@@ -9,10 +9,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.KeycloakSessionFactory;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.RoleModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RoleModel;
 import org.keycloak.services.resources.KeycloakApplication;
 
 public class ModelTest extends AbstractKeycloakServerTest {

services/src/test/java/org/keycloak/test/RealmCreationTest.java 4(+2 -2) 

diff --git a/services/src/test/java/org/keycloak/test/RealmCreationTest.java b/services/src/test/java/org/keycloak/test/RealmCreationTest.java
index c93c742..a99042f 100755
--- a/services/src/test/java/org/keycloak/test/RealmCreationTest.java
+++ b/services/src/test/java/org/keycloak/test/RealmCreationTest.java
@@ -9,8 +9,8 @@ import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
 import org.keycloak.services.managers.AuthenticationManager;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.RealmModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
 
 import javax.ws.rs.NotAuthorizedException;
 import javax.ws.rs.client.Entity;

services/src/test/resources/META-INF/persistence.xml 4(+2 -2) 

diff --git a/services/src/test/resources/META-INF/persistence.xml b/services/src/test/resources/META-INF/persistence.xml
index 0c8ed9e..c17ec56 100755
--- a/services/src/test/resources/META-INF/persistence.xml
+++ b/services/src/test/resources/META-INF/persistence.xml
@@ -18,8 +18,8 @@
         <class>org.picketlink.idm.jpa.model.sample.simple.X509CredentialTypeEntity</class>
         <class>org.picketlink.idm.jpa.model.sample.simple.OTPCredentialTypeEntity</class>
         <class>org.picketlink.idm.jpa.model.sample.simple.AttributeTypeEntity</class>
-        <class>org.keycloak.services.models.picketlink.mappings.RealmEntity</class>
-        <class>org.keycloak.services.models.picketlink.mappings.ApplicationEntity</class>
+        <class>org.keycloak.models.picketlink.mappings.RealmEntity</class>
+        <class>org.keycloak.models.picketlink.mappings.ApplicationEntity</class>
 
         <exclude-unlisted-classes>true</exclude-unlisted-classes>

testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java 6(+3 -3) 

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java b/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java
old mode 100644
new mode 100755
index 7d38da7..8b27729
--- a/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java
@@ -33,9 +33,9 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.keycloak.testsuite.pages.AppPage;
 import org.keycloak.testsuite.pages.AppPage.RequestType;
 import org.keycloak.testsuite.pages.LoginPage;

testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java 6(+3 -3) 

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java b/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java
old mode 100644
new mode 100755
index da1b747..51ba944
--- a/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java
@@ -26,9 +26,9 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.keycloak.testsuite.pages.AppPage;
 import org.keycloak.testsuite.pages.AppPage.RequestType;
 import org.keycloak.testsuite.pages.LoginPage;

testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java 6(+3 -3) 

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java b/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java
old mode 100644
new mode 100755
index 77c8814..f4cb070
--- a/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java
@@ -26,9 +26,9 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.keycloak.testsuite.OAuthClient;
 import org.keycloak.testsuite.pages.AppPage;
 import org.keycloak.testsuite.pages.AppPage.RequestType;

testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java 6(+3 -3) 

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java b/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java
old mode 100644
new mode 100755
index cf05276..916513d
--- a/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java
@@ -27,9 +27,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.keycloak.testsuite.pages.AppPage;
 import org.keycloak.testsuite.pages.AppPage.RequestType;
 import org.keycloak.testsuite.pages.LoginConfigTotpPage;

testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java 6(+3 -3) 

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java b/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java
old mode 100644
new mode 100755
index c1fe766..08a2bfa
--- a/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java
@@ -26,9 +26,9 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserModel;
-import org.keycloak.services.models.UserModel.RequiredAction;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserModel.RequiredAction;
 import org.keycloak.testsuite.pages.AppPage;
 import org.keycloak.testsuite.pages.AppPage.RequestType;
 import org.keycloak.testsuite.pages.LoginPage;

testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java 6(+3 -3) 

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java b/testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java
old mode 100644
new mode 100755
index bcc0516..b901c2e
--- a/testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java
@@ -28,9 +28,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserCredentialModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserCredentialModel;
+import org.keycloak.models.UserModel;
 import org.keycloak.testsuite.OAuthClient;
 import org.keycloak.testsuite.pages.AccountPasswordPage;
 import org.keycloak.testsuite.pages.AccountTotpPage;

testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java 6(+3 -3) 

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java b/testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java
old mode 100644
new mode 100755
index 6587cab..54451f4
--- a/testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java
@@ -30,9 +30,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.UserCredentialModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.UserCredentialModel;
+import org.keycloak.models.UserModel;
 import org.keycloak.testsuite.pages.AppPage;
 import org.keycloak.testsuite.pages.AppPage.RequestType;
 import org.keycloak.testsuite.pages.LoginPage;

testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java 10(+5 -5) 

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java b/testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java
old mode 100644
new mode 100755
index e62c955..2cc0df9
--- a/testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java
@@ -42,11 +42,11 @@ import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.services.filters.KeycloakSessionServletFilter;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.KeycloakSession;
-import org.keycloak.services.models.KeycloakSessionFactory;
-import org.keycloak.services.models.RealmModel;
-import org.keycloak.services.models.RoleModel;
-import org.keycloak.services.models.UserModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RoleModel;
+import org.keycloak.models.UserModel;
 import org.keycloak.services.resources.KeycloakApplication;
 import org.keycloak.services.resources.SaasService;
 import org.keycloak.testsuite.ApplicationServlet;

testsuite/src/test/java/org/keycloak/testsuite/social/SocialLoginTest.java 2(+1 -1) 

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/social/SocialLoginTest.java b/testsuite/src/test/java/org/keycloak/testsuite/social/SocialLoginTest.java
old mode 100644
new mode 100755
index 278e45c..7cb4178
--- a/testsuite/src/test/java/org/keycloak/testsuite/social/SocialLoginTest.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/social/SocialLoginTest.java
@@ -27,7 +27,7 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.services.models.RealmModel;
+import org.keycloak.models.RealmModel;
 import org.keycloak.testsuite.DummySocialServlet;
 import org.keycloak.testsuite.pages.AppPage;
 import org.keycloak.testsuite.pages.LoginPage;

testsuite/src/test/resources/META-INF/persistence.xml 4(+2 -2) 

diff --git a/testsuite/src/test/resources/META-INF/persistence.xml b/testsuite/src/test/resources/META-INF/persistence.xml
index 0c8ed9e..c17ec56 100755
--- a/testsuite/src/test/resources/META-INF/persistence.xml
+++ b/testsuite/src/test/resources/META-INF/persistence.xml
@@ -18,8 +18,8 @@
         <class>org.picketlink.idm.jpa.model.sample.simple.X509CredentialTypeEntity</class>
         <class>org.picketlink.idm.jpa.model.sample.simple.OTPCredentialTypeEntity</class>
         <class>org.picketlink.idm.jpa.model.sample.simple.AttributeTypeEntity</class>
-        <class>org.keycloak.services.models.picketlink.mappings.RealmEntity</class>
-        <class>org.keycloak.services.models.picketlink.mappings.ApplicationEntity</class>
+        <class>org.keycloak.models.picketlink.mappings.RealmEntity</class>
+        <class>org.keycloak.models.picketlink.mappings.ApplicationEntity</class>
 
         <exclude-unlisted-classes>true</exclude-unlisted-classes>

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