From a4e343144509089f54d6f47d6a60438889d57fcf Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Wed, 2 Oct 2013 09:54:26 -0400 Subject: [PATCH] model module refactor --- examples/as7-eap-demo/server/pom.xml | 10 +++ .../example/demo/DemoApplication.java | 6 +- .../main/resources/META-INF/persistence.xml | 4 +- forms/pom.xml | 5 ++ .../java/org/keycloak/forms/LoginBean.java | 2 +- .../java/org/keycloak/forms/RealmBean.java | 2 +- .../java/org/keycloak/forms/UserBean.java | 2 +- model/api/pom.xml | 30 +++++++ .../keycloak}/models/ApplicationModel.java | 2 +- .../java/org/keycloak/models/IdGenerator.java | 15 ++++ .../org/keycloak}/models/KeycloakSession.java | 2 +- .../models/KeycloakSessionFactory.java | 2 +- .../keycloak}/models/KeycloakTransaction.java | 2 +- .../java/org/keycloak}/models/RealmModel.java | 2 +- .../models/RequiredCredentialModel.java | 10 +-- .../java/org/keycloak}/models/RoleModel.java | 2 +- .../org/keycloak}/models/SocialLinkModel.java | 2 +- .../keycloak}/models/UserCredentialModel.java | 5 +- .../java/org/keycloak}/models/UserModel.java | 2 +- .../keycloak}/models/utils/ArrayUtils.java | 2 +- model/jpa/pom.xml | 51 ++++++++++++ .../models/jpa/entities/RealmEntity.java | 2 +- .../entities/RequiredCredentailEntity.java | 2 +- .../models/jpa/entities/ResourceEntity.java | 2 +- .../models/jpa/entities/RoleEntity.java | 2 +- .../jpa/entities/ScopeMappingEntity.java | 2 +- .../models/jpa/entities/UserEntity.java | 2 +- .../jpa/entities/UserRoleMappingEntity.java | 2 +- model/picketlink/pom.xml | 81 +++++++++++++++++++ .../models/picketlink/ApplicationAdapter.java | 12 +-- .../picketlink/PicketlinkKeycloakSession.java | 29 +++---- .../PicketlinkKeycloakSessionFactory.java | 6 +- .../PicketlinkKeycloakTransaction.java | 4 +- .../models/picketlink/RealmAdapter.java | 35 +++----- .../models/picketlink/RoleAdapter.java | 4 +- .../models/picketlink/UserAdapter.java | 6 +- .../picketlink/mappings/ApplicationData.java | 2 +- .../mappings/ApplicationEntity.java | 2 +- .../models/picketlink/mappings/RealmData.java | 2 +- .../picketlink/mappings/RealmEntity.java | 2 +- ...hClientRequiredCredentialRelationship.java | 2 +- .../relationships/RealmAdminRelationship.java | 2 +- ...iredApplicationCredentialRelationship.java | 2 +- .../RequiredCredentialRelationship.java | 2 +- .../relationships/ResourceRelationship.java | 2 +- .../relationships/ScopeRelationship.java | 2 +- .../relationships/SocialLinkRelationship.java | 2 +- model/pom.xml | 41 ++++++++++ pom.xml | 1 + services/pom.xml | 10 +++ .../org/keycloak/services/FormService.java | 4 +- .../keycloak/services/email/EmailSender.java | 4 +- .../filters/KeycloakSessionCleanupFilter.java | 2 +- .../filters/KeycloakSessionCreateFilter.java | 4 +- .../filters/KeycloakSessionServletFilter.java | 6 +- .../services/managers/AccessCodeEntry.java | 6 +- .../managers/AuthenticationManager.java | 6 +- .../services/managers/RealmManager.java | 4 +- .../managers/ResourceAdminManager.java | 4 +- .../services/managers/ResourceManager.java | 2 +- .../services/managers/TokenManager.java | 8 +- .../services/managers/UserManager.java | 6 +- .../services/resources/AccountService.java | 8 +- .../resources/KeycloakApplication.java | 10 +-- .../resources/PublicRealmResource.java | 2 +- .../services/resources/RealmsResource.java | 4 +- .../services/resources/SaasService.java | 3 +- .../services/resources/SocialResource.java | 4 +- .../services/resources/TokenService.java | 5 +- .../services/resources/Transaction.java | 4 +- .../resources/admin/ApplicationResource.java | 2 +- .../resources/admin/ApplicationsResource.java | 8 +- .../resources/admin/RealmAdminResource.java | 11 +-- .../resources/admin/RealmsAdminResource.java | 6 +- .../resources/admin/UsersResource.java | 2 +- .../services/resources/flows/Flows.java | 2 +- .../services/resources/flows/FormFlows.java | 6 +- .../services/resources/flows/OAuthFlows.java | 8 +- .../managers/AuthenticationManagerTest.java | 12 +-- .../services/models/utils/ArrayUtilsTest.java | 35 -------- .../java/org/keycloak/test/AdapterTest.java | 18 ++--- .../java/org/keycloak/test/ImportTest.java | 16 ++-- .../keycloak/test/InstallationManager.java | 4 +- .../java/org/keycloak/test/ModelTest.java | 8 +- .../org/keycloak/test/RealmCreationTest.java | 4 +- .../test/resources/META-INF/persistence.xml | 4 +- .../RequiredActionEmailVerificationTest.java | 6 +- .../RequiredActionMultipleActionsTest.java | 6 +- .../RequiredActionResetPasswordTest.java | 6 +- .../actions/RequiredActionTotpSetupTest.java | 6 +- .../RequiredActionUpdateProfileTest.java | 6 +- .../keycloak/testsuite/forms/AccountTest.java | 6 +- .../testsuite/forms/LoginTotpTest.java | 6 +- .../keycloak/testsuite/rule/KeycloakRule.java | 10 +-- .../testsuite/social/SocialLoginTest.java | 2 +- .../test/resources/META-INF/persistence.xml | 4 +- 96 files changed, 449 insertions(+), 276 deletions(-) mode change 100644 => 100755 forms/src/main/java/org/keycloak/forms/LoginBean.java mode change 100644 => 100755 forms/src/main/java/org/keycloak/forms/RealmBean.java mode change 100644 => 100755 forms/src/main/java/org/keycloak/forms/UserBean.java create mode 100755 model/api/pom.xml rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/ApplicationModel.java (92%) create mode 100755 model/api/src/main/java/org/keycloak/models/IdGenerator.java rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/KeycloakSession.java (88%) rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/KeycloakSessionFactory.java (80%) rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/KeycloakTransaction.java (84%) rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/RealmModel.java (95%) rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/RequiredCredentialModel.java (84%) rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/RoleModel.java (83%) rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/SocialLinkModel.java (95%) mode change 100644 => 100755 rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/UserCredentialModel.java (77%) rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/UserModel.java (92%) rename {services/src/main/java/org/keycloak/services => model/api/src/main/java/org/keycloak}/models/utils/ArrayUtils.java (94%) mode change 100644 => 100755 create mode 100755 model/jpa/pom.xml rename {services/src/main/java/org/keycloak/services => model/jpa/src/main/java/org/keycloak}/models/jpa/entities/RealmEntity.java (91%) rename {services/src/main/java/org/keycloak/services => model/jpa/src/main/java/org/keycloak}/models/jpa/entities/RequiredCredentailEntity.java (74%) rename {services/src/main/java/org/keycloak/services => model/jpa/src/main/java/org/keycloak}/models/jpa/entities/ResourceEntity.java (93%) rename {services/src/main/java/org/keycloak/services => model/jpa/src/main/java/org/keycloak}/models/jpa/entities/RoleEntity.java (89%) rename {services/src/main/java/org/keycloak/services => model/jpa/src/main/java/org/keycloak}/models/jpa/entities/ScopeMappingEntity.java (89%) rename {services/src/main/java/org/keycloak/services => model/jpa/src/main/java/org/keycloak}/models/jpa/entities/UserEntity.java (87%) rename {services/src/main/java/org/keycloak/services => model/jpa/src/main/java/org/keycloak}/models/jpa/entities/UserRoleMappingEntity.java (89%) create mode 100755 model/picketlink/pom.xml rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/ApplicationAdapter.java (95%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/PicketlinkKeycloakSession.java (75%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/PicketlinkKeycloakSessionFactory.java (80%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/PicketlinkKeycloakTransaction.java (85%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/RealmAdapter.java (92%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/RoleAdapter.java (89%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/UserAdapter.java (93%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/mappings/ApplicationData.java (92%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/mappings/ApplicationEntity.java (93%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/mappings/RealmData.java (94%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/mappings/RealmEntity.java (95%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/relationships/OAuthClientRequiredCredentialRelationship.java (73%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/relationships/RealmAdminRelationship.java (91%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/relationships/RequiredApplicationCredentialRelationship.java (73%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/relationships/RequiredCredentialRelationship.java (93%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/relationships/ResourceRelationship.java (91%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/relationships/ScopeRelationship.java (90%) rename {services/src/main/java/org/keycloak/services => model/picketlink/src/main/java/org/keycloak}/models/picketlink/relationships/SocialLinkRelationship.java (96%) mode change 100644 => 100755 create mode 100755 model/pom.xml mode change 100644 => 100755 services/src/main/java/org/keycloak/services/FormService.java mode change 100644 => 100755 services/src/main/java/org/keycloak/services/email/EmailSender.java mode change 100644 => 100755 services/src/test/java/org/keycloak/services/managers/AuthenticationManagerTest.java delete mode 100644 services/src/test/java/org/keycloak/services/models/utils/ArrayUtilsTest.java mode change 100644 => 100755 services/src/test/java/org/keycloak/test/ModelTest.java mode change 100644 => 100755 testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java mode change 100644 => 100755 testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java mode change 100644 => 100755 testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java mode change 100644 => 100755 testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java mode change 100644 => 100755 testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java mode change 100644 => 100755 testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java mode change 100644 => 100755 testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java mode change 100644 => 100755 testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java mode change 100644 => 100755 testsuite/src/test/java/org/keycloak/testsuite/social/SocialLoginTest.java diff --git a/examples/as7-eap-demo/server/pom.xml b/examples/as7-eap-demo/server/pom.xml index 00d3daedf1..36d7cf8bc7 100755 --- a/examples/as7-eap-demo/server/pom.xml +++ b/examples/as7-eap-demo/server/pom.xml @@ -30,6 +30,16 @@ keycloak-services ${project.version} + + org.keycloak + keycloak-model-api + ${project.version} + + + org.keycloak + keycloak-model-picketlink + ${project.version} + org.keycloak keycloak-social-core 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 b7c11f217b..2103030eb9 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; 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 ad40046847..cb5a1c34ec 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 @@ org.picketlink.idm.jpa.model.sample.simple.X509CredentialTypeEntity org.picketlink.idm.jpa.model.sample.simple.OTPCredentialTypeEntity org.picketlink.idm.jpa.model.sample.simple.AttributeTypeEntity - org.keycloak.services.models.picketlink.mappings.RealmEntity - org.keycloak.services.models.picketlink.mappings.ApplicationEntity + org.keycloak.models.picketlink.mappings.RealmEntity + org.keycloak.models.picketlink.mappings.ApplicationEntity true diff --git a/forms/pom.xml b/forms/pom.xml index 0ad29576ee..6d0dec8ebf 100755 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -18,6 +18,11 @@ keycloak-core ${project.version} + + org.keycloak + keycloak-model-api + ${project.version} + org.keycloak keycloak-services 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 5777e91d1b..9174813539 --- 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(); - 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())); } 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 e799b7ac7e..c92263819e --- 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 Stian Thorgersen 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 97fe839dd8..019adb2c49 --- 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 Stian Thorgersen diff --git a/model/api/pom.xml b/model/api/pom.xml new file mode 100755 index 0000000000..48e4ac99b7 --- /dev/null +++ b/model/api/pom.xml @@ -0,0 +1,30 @@ + + + + keycloak-parent + org.keycloak + 1.0-alpha-1 + ../../pom.xml + + 4.0.0 + + keycloak-model-api + Keycloak Model API + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + + + diff --git a/services/src/main/java/org/keycloak/services/models/ApplicationModel.java b/model/api/src/main/java/org/keycloak/models/ApplicationModel.java similarity index 92% rename from services/src/main/java/org/keycloak/services/models/ApplicationModel.java rename to model/api/src/main/java/org/keycloak/models/ApplicationModel.java index b017885f4f..433d392304 100755 --- a/services/src/main/java/org/keycloak/services/models/ApplicationModel.java +++ b/model/api/src/main/java/org/keycloak/models/ApplicationModel.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models; +package org.keycloak.models; import java.util.List; import java.util.Set; 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 0000000000..3a1b028200 --- /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 Bill Burke + * @version $Revision: 1 $ + */ +public class IdGenerator { + private static AtomicLong counter = new AtomicLong(1); + public static String generateId() { + return counter.getAndIncrement() + "-" + System.currentTimeMillis(); + } + +} diff --git a/services/src/main/java/org/keycloak/services/models/KeycloakSession.java b/model/api/src/main/java/org/keycloak/models/KeycloakSession.java similarity index 88% rename from services/src/main/java/org/keycloak/services/models/KeycloakSession.java rename to model/api/src/main/java/org/keycloak/models/KeycloakSession.java index 18c750614c..43d4298157 100755 --- a/services/src/main/java/org/keycloak/services/models/KeycloakSession.java +++ b/model/api/src/main/java/org/keycloak/models/KeycloakSession.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models; +package org.keycloak.models; import java.util.List; diff --git a/services/src/main/java/org/keycloak/services/models/KeycloakSessionFactory.java b/model/api/src/main/java/org/keycloak/models/KeycloakSessionFactory.java similarity index 80% rename from services/src/main/java/org/keycloak/services/models/KeycloakSessionFactory.java rename to model/api/src/main/java/org/keycloak/models/KeycloakSessionFactory.java index e582b40be9..3149f9b27b 100755 --- a/services/src/main/java/org/keycloak/services/models/KeycloakSessionFactory.java +++ b/model/api/src/main/java/org/keycloak/models/KeycloakSessionFactory.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models; +package org.keycloak.models; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/models/KeycloakTransaction.java b/model/api/src/main/java/org/keycloak/models/KeycloakTransaction.java similarity index 84% rename from services/src/main/java/org/keycloak/services/models/KeycloakTransaction.java rename to model/api/src/main/java/org/keycloak/models/KeycloakTransaction.java index bc2e08d05c..5db29f3ca4 100755 --- a/services/src/main/java/org/keycloak/services/models/KeycloakTransaction.java +++ b/model/api/src/main/java/org/keycloak/models/KeycloakTransaction.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models; +package org.keycloak.models; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/models/RealmModel.java b/model/api/src/main/java/org/keycloak/models/RealmModel.java similarity index 95% rename from services/src/main/java/org/keycloak/services/models/RealmModel.java rename to model/api/src/main/java/org/keycloak/models/RealmModel.java index da85bace5c..43d1d87300 100755 --- a/services/src/main/java/org/keycloak/services/models/RealmModel.java +++ b/model/api/src/main/java/org/keycloak/models/RealmModel.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models; +package org.keycloak.models; import java.security.PrivateKey; import java.security.PublicKey; diff --git a/services/src/main/java/org/keycloak/services/models/RequiredCredentialModel.java b/model/api/src/main/java/org/keycloak/models/RequiredCredentialModel.java similarity index 84% rename from services/src/main/java/org/keycloak/services/models/RequiredCredentialModel.java rename to model/api/src/main/java/org/keycloak/models/RequiredCredentialModel.java index de99a7c18b..737c1b4a10 100755 --- a/services/src/main/java/org/keycloak/services/models/RequiredCredentialModel.java +++ b/model/api/src/main/java/org/keycloak/models/RequiredCredentialModel.java @@ -1,6 +1,4 @@ -package org.keycloak.services.models; - -import org.keycloak.representations.idm.CredentialRepresentation; +package org.keycloak.models; import java.util.Collections; import java.util.HashMap; @@ -59,19 +57,19 @@ public class RequiredCredentialModel { static { Map map = new HashMap(); PASSWORD = new RequiredCredentialModel(); - PASSWORD.setType(CredentialRepresentation.PASSWORD); + PASSWORD.setType(UserCredentialModel.PASSWORD); PASSWORD.setInput(true); PASSWORD.setSecret(true); PASSWORD.setFormLabel("password"); map.put(PASSWORD.getType(), PASSWORD); TOTP = new RequiredCredentialModel(); - TOTP.setType(CredentialRepresentation.TOTP); + TOTP.setType(UserCredentialModel.TOTP); TOTP.setInput(true); TOTP.setSecret(false); TOTP.setFormLabel("authenticatorCode"); map.put(TOTP.getType(), TOTP); CLIENT_CERT = new RequiredCredentialModel(); - CLIENT_CERT.setType(CredentialRepresentation.CLIENT_CERT); + CLIENT_CERT.setType(UserCredentialModel.CLIENT_CERT); CLIENT_CERT.setInput(false); CLIENT_CERT.setSecret(false); CLIENT_CERT.setFormLabel("clientCertificate"); diff --git a/services/src/main/java/org/keycloak/services/models/RoleModel.java b/model/api/src/main/java/org/keycloak/models/RoleModel.java similarity index 83% rename from services/src/main/java/org/keycloak/services/models/RoleModel.java rename to model/api/src/main/java/org/keycloak/models/RoleModel.java index 9ec6ab485d..a8e8ebe195 100755 --- a/services/src/main/java/org/keycloak/services/models/RoleModel.java +++ b/model/api/src/main/java/org/keycloak/models/RoleModel.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models; +package org.keycloak.models; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/models/SocialLinkModel.java b/model/api/src/main/java/org/keycloak/models/SocialLinkModel.java old mode 100644 new mode 100755 similarity index 95% rename from services/src/main/java/org/keycloak/services/models/SocialLinkModel.java rename to model/api/src/main/java/org/keycloak/models/SocialLinkModel.java index 7a92d8d958..a484477b9d --- a/services/src/main/java/org/keycloak/services/models/SocialLinkModel.java +++ b/model/api/src/main/java/org/keycloak/models/SocialLinkModel.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models; +package org.keycloak.models; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/services/models/UserCredentialModel.java b/model/api/src/main/java/org/keycloak/models/UserCredentialModel.java similarity index 77% rename from services/src/main/java/org/keycloak/services/models/UserCredentialModel.java rename to model/api/src/main/java/org/keycloak/models/UserCredentialModel.java index 1ccf8be787..a20450cf69 100755 --- a/services/src/main/java/org/keycloak/services/models/UserCredentialModel.java +++ b/model/api/src/main/java/org/keycloak/models/UserCredentialModel.java @@ -1,10 +1,13 @@ -package org.keycloak.services.models; +package org.keycloak.models; /** * @author Bill Burke * @version $Revision: 1 $ */ public class UserCredentialModel { + public static final String PASSWORD = "password"; + public static final String TOTP = "totp"; + public static final String CLIENT_CERT = "cert"; protected String type; protected String value; diff --git a/services/src/main/java/org/keycloak/services/models/UserModel.java b/model/api/src/main/java/org/keycloak/models/UserModel.java similarity index 92% rename from services/src/main/java/org/keycloak/services/models/UserModel.java rename to model/api/src/main/java/org/keycloak/models/UserModel.java index 2e6d77f907..2131d3ca91 100755 --- a/services/src/main/java/org/keycloak/services/models/UserModel.java +++ b/model/api/src/main/java/org/keycloak/models/UserModel.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models; +package org.keycloak.models; import java.util.Map; import java.util.Set; diff --git a/services/src/main/java/org/keycloak/services/models/utils/ArrayUtils.java b/model/api/src/main/java/org/keycloak/models/utils/ArrayUtils.java old mode 100644 new mode 100755 similarity index 94% rename from services/src/main/java/org/keycloak/services/models/utils/ArrayUtils.java rename to model/api/src/main/java/org/keycloak/models/utils/ArrayUtils.java index f3f8d88584..70c2b1e7b8 --- a/services/src/main/java/org/keycloak/services/models/utils/ArrayUtils.java +++ b/model/api/src/main/java/org/keycloak/models/utils/ArrayUtils.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.utils; +package org.keycloak.models.utils; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml new file mode 100755 index 0000000000..8f6edf9cc9 --- /dev/null +++ b/model/jpa/pom.xml @@ -0,0 +1,51 @@ + + + + keycloak-parent + org.keycloak + 1.0-alpha-1 + ../pom.xml + + 4.0.0 + + keycloak-model-jpa + Keycloak Model JPA + + + + + org.bouncycastle + bcprov-jdk16 + provided + + + org.keycloak + keycloak-core + ${project.version} + provided + + + org.keycloak + keycloak-model-api + ${project.version} + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + provided + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + + + diff --git a/services/src/main/java/org/keycloak/services/models/jpa/entities/RealmEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java similarity index 91% rename from services/src/main/java/org/keycloak/services/models/jpa/entities/RealmEntity.java rename to model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java index a199f86409..7712490a5b 100755 --- a/services/src/main/java/org/keycloak/services/models/jpa/entities/RealmEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.jpa.entities; +package org.keycloak.models.jpa.entities; import javax.persistence.*; diff --git a/services/src/main/java/org/keycloak/services/models/jpa/entities/RequiredCredentailEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentailEntity.java similarity index 74% rename from services/src/main/java/org/keycloak/services/models/jpa/entities/RequiredCredentailEntity.java rename to model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentailEntity.java index 7583cea377..b2509a249a 100755 --- a/services/src/main/java/org/keycloak/services/models/jpa/entities/RequiredCredentailEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentailEntity.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.jpa.entities; +package org.keycloak.models.jpa.entities; import javax.persistence.Entity; diff --git a/services/src/main/java/org/keycloak/services/models/jpa/entities/ResourceEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ResourceEntity.java similarity index 93% rename from services/src/main/java/org/keycloak/services/models/jpa/entities/ResourceEntity.java rename to model/jpa/src/main/java/org/keycloak/models/jpa/entities/ResourceEntity.java index fa3b3c2234..dc32ed9fdb 100755 --- a/services/src/main/java/org/keycloak/services/models/jpa/entities/ResourceEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ResourceEntity.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.jpa.entities; +package org.keycloak.models.jpa.entities; import javax.persistence.*; import java.util.Collection; diff --git a/services/src/main/java/org/keycloak/services/models/jpa/entities/RoleEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java similarity index 89% rename from services/src/main/java/org/keycloak/services/models/jpa/entities/RoleEntity.java rename to model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java index 2be958a4f8..63ff8e8983 100755 --- a/services/src/main/java/org/keycloak/services/models/jpa/entities/RoleEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.jpa.entities; +package org.keycloak.models.jpa.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/services/src/main/java/org/keycloak/services/models/jpa/entities/ScopeMappingEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ScopeMappingEntity.java similarity index 89% rename from services/src/main/java/org/keycloak/services/models/jpa/entities/ScopeMappingEntity.java rename to model/jpa/src/main/java/org/keycloak/models/jpa/entities/ScopeMappingEntity.java index 362dcdd190..1ac8ed86b4 100755 --- a/services/src/main/java/org/keycloak/services/models/jpa/entities/ScopeMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ScopeMappingEntity.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.jpa.entities; +package org.keycloak.models.jpa.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/services/src/main/java/org/keycloak/services/models/jpa/entities/UserEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java similarity index 87% rename from services/src/main/java/org/keycloak/services/models/jpa/entities/UserEntity.java rename to model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java index 1b3994eb3d..94bdf88ac9 100755 --- a/services/src/main/java/org/keycloak/services/models/jpa/entities/UserEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.jpa.entities; +package org.keycloak.models.jpa.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/services/src/main/java/org/keycloak/services/models/jpa/entities/UserRoleMappingEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java similarity index 89% rename from services/src/main/java/org/keycloak/services/models/jpa/entities/UserRoleMappingEntity.java rename to model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java index ae68f9720c..51099df255 100755 --- a/services/src/main/java/org/keycloak/services/models/jpa/entities/UserRoleMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.jpa.entities; +package org.keycloak.models.jpa.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/model/picketlink/pom.xml b/model/picketlink/pom.xml new file mode 100755 index 0000000000..a035b19a37 --- /dev/null +++ b/model/picketlink/pom.xml @@ -0,0 +1,81 @@ + + + + keycloak-parent + org.keycloak + 1.0-alpha-1 + ../pom.xml + + 4.0.0 + + keycloak-model-picketlink + Keycloak Model Picketlink + + + + + org.bouncycastle + bcprov-jdk16 + provided + + + org.keycloak + keycloak-core + ${project.version} + provided + + + org.keycloak + keycloak-model-api + ${project.version} + + + org.jboss.logging + jboss-logging + provided + + + org.picketlink + picketlink-idm-api + provided + + + org.picketlink + picketlink-common + provided + + + org.picketlink + picketlink-idm-impl + provided + + + org.picketlink + picketlink-idm-simple-schema + provided + + + org.picketlink + picketlink-config + provided + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + provided + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + + + diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/ApplicationAdapter.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/ApplicationAdapter.java similarity index 95% rename from services/src/main/java/org/keycloak/services/models/picketlink/ApplicationAdapter.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/ApplicationAdapter.java index dccf7dea18..eb2fad7c88 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/ApplicationAdapter.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/ApplicationAdapter.java @@ -1,10 +1,10 @@ -package org.keycloak.services.models.picketlink; +package org.keycloak.models.picketlink; -import org.keycloak.services.models.ApplicationModel; -import org.keycloak.services.models.RoleModel; -import org.keycloak.services.models.UserModel; -import org.keycloak.services.models.picketlink.mappings.ApplicationData; -import org.keycloak.services.models.picketlink.relationships.ScopeRelationship; +import org.keycloak.models.ApplicationModel; +import org.keycloak.models.RoleModel; +import org.keycloak.models.UserModel; +import org.keycloak.models.picketlink.mappings.ApplicationData; +import org.keycloak.models.picketlink.relationships.ScopeRelationship; import org.picketlink.idm.IdentityManager; import org.picketlink.idm.PartitionManager; import org.picketlink.idm.RelationshipManager; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakSession.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakSession.java similarity index 75% rename from services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakSession.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakSession.java index 4a2a4265ed..4139e03ee7 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakSession.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakSession.java @@ -1,14 +1,11 @@ -package org.keycloak.services.models.picketlink; +package org.keycloak.models.picketlink; -import org.jboss.resteasy.spi.HttpRequest; -import org.jboss.resteasy.spi.NotImplementedYetException; -import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.services.models.KeycloakSession; -import org.keycloak.services.models.KeycloakTransaction; -import org.keycloak.services.models.RealmModel; -import org.keycloak.services.models.UserModel; -import org.keycloak.services.models.picketlink.mappings.RealmData; -import org.keycloak.services.models.picketlink.relationships.RealmAdminRelationship; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakTransaction; +import org.keycloak.models.RealmModel; +import org.keycloak.models.UserModel; +import org.keycloak.models.picketlink.mappings.RealmData; +import org.keycloak.models.picketlink.relationships.RealmAdminRelationship; import org.picketlink.idm.PartitionManager; import org.picketlink.idm.RelationshipManager; import org.picketlink.idm.query.RelationshipQuery; @@ -25,7 +22,6 @@ import java.util.concurrent.atomic.AtomicLong; public class PicketlinkKeycloakSession implements KeycloakSession { public static ThreadLocal currentEntityManager = new ThreadLocal(); public static ThreadLocal setWhere = new ThreadLocal(); - public static ThreadLocal setFromPath = new ThreadLocal(); protected PartitionManager partitionManager; protected EntityManager entityManager; @@ -40,14 +36,8 @@ public class PicketlinkKeycloakSession implements KeycloakSession { if (currentEntityManager.get() != null) { setWhere.get().printStackTrace(); - String path = setFromPath.get(); - if (path == null) path = "???"; - throw new IllegalStateException("Thread local was leaked! from path: " + path); - } - HttpRequest request = ResteasyProviderFactory.getContextData(HttpRequest.class); - if (request != null) { - setFromPath.set(request.getUri().getPath()); + throw new IllegalStateException("Thread local was leaked!"); } currentEntityManager.set(entityManager); setWhere.set(new Exception()); @@ -104,13 +94,12 @@ public class PicketlinkKeycloakSession implements KeycloakSession { @Override public void deleteRealm(RealmModel realm) { - throw new NotImplementedYetException(); + throw new RuntimeException("Not Implemented Yet"); } @Override public void close() { - setFromPath.set(null); setWhere.set(null); currentEntityManager.set(null); if (entityManager.getTransaction().isActive()) entityManager.getTransaction().rollback(); diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakSessionFactory.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakSessionFactory.java similarity index 80% rename from services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakSessionFactory.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakSessionFactory.java index c77a73226b..1d01f906ac 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakSessionFactory.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakSessionFactory.java @@ -1,7 +1,7 @@ -package org.keycloak.services.models.picketlink; +package org.keycloak.models.picketlink; -import org.keycloak.services.models.KeycloakSession; -import org.keycloak.services.models.KeycloakSessionFactory; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; import org.picketlink.idm.PartitionManager; import javax.persistence.EntityManagerFactory; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakTransaction.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakTransaction.java similarity index 85% rename from services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakTransaction.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakTransaction.java index 7be3218f53..4eb14ccf4d 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakTransaction.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakTransaction.java @@ -1,6 +1,6 @@ -package org.keycloak.services.models.picketlink; +package org.keycloak.models.picketlink; -import org.keycloak.services.models.KeycloakTransaction; +import org.keycloak.models.KeycloakTransaction; import javax.persistence.EntityTransaction; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/RealmAdapter.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/RealmAdapter.java similarity index 92% rename from services/src/main/java/org/keycloak/services/models/picketlink/RealmAdapter.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/RealmAdapter.java index bbcc15b19e..e7d86426f8 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/RealmAdapter.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/RealmAdapter.java @@ -1,22 +1,12 @@ -package org.keycloak.services.models.picketlink; +package org.keycloak.models.picketlink; import org.bouncycastle.openssl.PEMWriter; -import org.jboss.resteasy.logging.Logger; -import org.jboss.resteasy.security.PemUtils; -import org.keycloak.representations.idm.CredentialRepresentation; -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.services.models.ApplicationModel; -import org.keycloak.services.models.RoleModel; -import org.keycloak.services.models.SocialLinkModel; -import org.keycloak.services.models.UserCredentialModel; -import org.keycloak.services.models.UserModel; -import org.keycloak.services.models.picketlink.mappings.RealmData; -import org.keycloak.services.models.picketlink.mappings.ApplicationData; -import org.keycloak.services.models.picketlink.relationships.*; -import org.keycloak.services.models.picketlink.relationships.RequiredApplicationCredentialRelationship; +import org.keycloak.PemUtils; +import org.keycloak.models.*; +import org.keycloak.models.picketlink.mappings.RealmData; +import org.keycloak.models.picketlink.mappings.ApplicationData; +import org.keycloak.models.picketlink.relationships.*; +import org.keycloak.models.picketlink.relationships.RequiredApplicationCredentialRelationship; import org.picketlink.idm.IdentityManager; import org.picketlink.idm.PartitionManager; import org.picketlink.idm.RelationshipManager; @@ -54,7 +44,6 @@ import java.util.Set; * @version $Revision: 1 $ */ public class RealmAdapter implements RealmModel { - protected static final Logger logger = Logger.getLogger(RealmManager.class); protected RealmData realm; protected volatile transient PublicKey publicKey; @@ -391,7 +380,6 @@ public class RealmAdapter implements RealmModel { } } for (String cred : creds) { - logger.info("updating cred: " + cred); if (!already.contains(cred)) { addRequiredCredential(cred); } @@ -483,14 +471,14 @@ public class RealmAdapter implements RealmModel { @Override public void updateCredential(UserModel user, UserCredentialModel cred) { IdentityManager idm = getIdm(); - if (cred.getType().equals(CredentialRepresentation.PASSWORD)) { + if (cred.getType().equals(UserCredentialModel.PASSWORD)) { Password password = new Password(cred.getValue()); idm.updateCredential(((UserAdapter)user).getUser(), password); - } else if (cred.getType().equals(CredentialRepresentation.TOTP)) { + } else if (cred.getType().equals(UserCredentialModel.TOTP)) { TOTPCredential totp = new TOTPCredential(cred.getValue()); totp.setDevice(cred.getDevice()); idm.updateCredential(((UserAdapter)user).getUser(), totp); - } else if (cred.getType().equals(CredentialRepresentation.CLIENT_CERT)) { + } else if (cred.getType().equals(UserCredentialModel.CLIENT_CERT)) { X509Certificate cert = null; try { cert = org.keycloak.PemUtils.decodeCertificate(cred.getValue()); @@ -608,7 +596,7 @@ public class RealmAdapter implements RealmModel { @Override public ApplicationModel addApplication(String name) { - ApplicationData applicationData = new ApplicationData(RealmManager.generateId()); + ApplicationData applicationData = new ApplicationData(IdGenerator.generateId()); User resourceUser = new User(name); idm.add(resourceUser); applicationData.setResourceUser(resourceUser); @@ -704,7 +692,6 @@ public class RealmAdapter implements RealmModel { @Override public boolean isRealmAdmin(UserModel agent) { - RealmAdapter realmModel = (RealmAdapter)new RealmManager(session).defaultRealm(); RelationshipQuery query = getRelationshipManager().createRelationshipQuery(RealmAdminRelationship.class); query.setParameter(RealmAdminRelationship.REALM, realm.getName()); query.setParameter(RealmAdminRelationship.ADMIN, ((UserAdapter)agent).getUser()); diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/RoleAdapter.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/RoleAdapter.java similarity index 89% rename from services/src/main/java/org/keycloak/services/models/picketlink/RoleAdapter.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/RoleAdapter.java index 2d715e2459..efe14037f9 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/RoleAdapter.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/RoleAdapter.java @@ -1,6 +1,6 @@ -package org.keycloak.services.models.picketlink; +package org.keycloak.models.picketlink; -import org.keycloak.services.models.RoleModel; +import org.keycloak.models.RoleModel; import org.picketlink.idm.IdentityManager; import org.picketlink.idm.model.Attribute; import org.picketlink.idm.model.sample.Role; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/UserAdapter.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/UserAdapter.java similarity index 93% rename from services/src/main/java/org/keycloak/services/models/picketlink/UserAdapter.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/UserAdapter.java index 169a4e2c5e..de303b43c8 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/UserAdapter.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/UserAdapter.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink; +package org.keycloak.models.picketlink; import java.util.Arrays; import java.util.Collections; @@ -7,8 +7,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.keycloak.services.models.UserModel; -import org.keycloak.services.models.utils.ArrayUtils; +import org.keycloak.models.UserModel; +import org.keycloak.models.utils.ArrayUtils; import org.picketlink.idm.IdentityManager; import org.picketlink.idm.model.Attribute; import org.picketlink.idm.model.sample.User; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/mappings/ApplicationData.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/ApplicationData.java similarity index 92% rename from services/src/main/java/org/keycloak/services/models/picketlink/mappings/ApplicationData.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/ApplicationData.java index f515f2875d..418e8011c6 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/mappings/ApplicationData.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/ApplicationData.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.mappings; +package org.keycloak.models.picketlink.mappings; import org.picketlink.idm.model.AbstractPartition; import org.picketlink.idm.model.annotation.AttributeProperty; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/mappings/ApplicationEntity.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/ApplicationEntity.java similarity index 93% rename from services/src/main/java/org/keycloak/services/models/picketlink/mappings/ApplicationEntity.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/ApplicationEntity.java index c3aa79648d..ccfdf3d4e0 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/mappings/ApplicationEntity.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/ApplicationEntity.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.mappings; +package org.keycloak.models.picketlink.mappings; import org.picketlink.idm.jpa.annotations.AttributeValue; import org.picketlink.idm.jpa.annotations.OwnerReference; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/mappings/RealmData.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/RealmData.java similarity index 94% rename from services/src/main/java/org/keycloak/services/models/picketlink/mappings/RealmData.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/RealmData.java index cbf4ca5bda..8329e28672 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/mappings/RealmData.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/RealmData.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.mappings; +package org.keycloak.models.picketlink.mappings; import org.picketlink.idm.model.AbstractPartition; import org.picketlink.idm.model.annotation.AttributeProperty; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/mappings/RealmEntity.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/RealmEntity.java similarity index 95% rename from services/src/main/java/org/keycloak/services/models/picketlink/mappings/RealmEntity.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/RealmEntity.java index 6e8d9bdf94..b44c218faa 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/mappings/RealmEntity.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/RealmEntity.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.mappings; +package org.keycloak.models.picketlink.mappings; import org.picketlink.idm.jpa.annotations.AttributeValue; import org.picketlink.idm.jpa.annotations.OwnerReference; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/OAuthClientRequiredCredentialRelationship.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/OAuthClientRequiredCredentialRelationship.java similarity index 73% rename from services/src/main/java/org/keycloak/services/models/picketlink/relationships/OAuthClientRequiredCredentialRelationship.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/OAuthClientRequiredCredentialRelationship.java index f14c808243..441b2106e8 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/OAuthClientRequiredCredentialRelationship.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/OAuthClientRequiredCredentialRelationship.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.relationships; +package org.keycloak.models.picketlink.relationships; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/RealmAdminRelationship.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RealmAdminRelationship.java similarity index 91% rename from services/src/main/java/org/keycloak/services/models/picketlink/relationships/RealmAdminRelationship.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RealmAdminRelationship.java index ab284ba425..1a8de46cd9 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/RealmAdminRelationship.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RealmAdminRelationship.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.relationships; +package org.keycloak.models.picketlink.relationships; import org.picketlink.idm.model.AbstractAttributedType; import org.picketlink.idm.model.Attribute; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/RequiredApplicationCredentialRelationship.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RequiredApplicationCredentialRelationship.java similarity index 73% rename from services/src/main/java/org/keycloak/services/models/picketlink/relationships/RequiredApplicationCredentialRelationship.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RequiredApplicationCredentialRelationship.java index aa28ee5a1a..f811e1243f 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/RequiredApplicationCredentialRelationship.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RequiredApplicationCredentialRelationship.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.relationships; +package org.keycloak.models.picketlink.relationships; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/RequiredCredentialRelationship.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RequiredCredentialRelationship.java similarity index 93% rename from services/src/main/java/org/keycloak/services/models/picketlink/relationships/RequiredCredentialRelationship.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RequiredCredentialRelationship.java index c24b128ecb..03dfa5e18f 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/RequiredCredentialRelationship.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RequiredCredentialRelationship.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.relationships; +package org.keycloak.models.picketlink.relationships; import org.picketlink.idm.model.AbstractAttributedType; import org.picketlink.idm.model.Attribute; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/ResourceRelationship.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/ResourceRelationship.java similarity index 91% rename from services/src/main/java/org/keycloak/services/models/picketlink/relationships/ResourceRelationship.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/ResourceRelationship.java index 3c48b97788..48463872ae 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/ResourceRelationship.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/ResourceRelationship.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.relationships; +package org.keycloak.models.picketlink.relationships; import org.picketlink.idm.model.AbstractAttributedType; import org.picketlink.idm.model.Attribute; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/ScopeRelationship.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/ScopeRelationship.java similarity index 90% rename from services/src/main/java/org/keycloak/services/models/picketlink/relationships/ScopeRelationship.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/ScopeRelationship.java index 38e3acf22e..96ed96ec26 100755 --- a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/ScopeRelationship.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/ScopeRelationship.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.relationships; +package org.keycloak.models.picketlink.relationships; import org.picketlink.idm.model.AbstractAttributedType; import org.picketlink.idm.model.Relationship; diff --git a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/SocialLinkRelationship.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/SocialLinkRelationship.java old mode 100644 new mode 100755 similarity index 96% rename from services/src/main/java/org/keycloak/services/models/picketlink/relationships/SocialLinkRelationship.java rename to model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/SocialLinkRelationship.java index c3a93895db..e9be9d467b --- a/services/src/main/java/org/keycloak/services/models/picketlink/relationships/SocialLinkRelationship.java +++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/SocialLinkRelationship.java @@ -1,4 +1,4 @@ -package org.keycloak.services.models.picketlink.relationships; +package org.keycloak.models.picketlink.relationships; import org.picketlink.idm.model.AbstractAttributedType; import org.picketlink.idm.model.Attribute; diff --git a/model/pom.xml b/model/pom.xml new file mode 100755 index 0000000000..c6a4a9ef90 --- /dev/null +++ b/model/pom.xml @@ -0,0 +1,41 @@ + + + keycloak-parent + org.keycloak + 1.0-alpha-1 + ../pom.xml + + Examples + + 4.0.0 + + org.keycloak + keycloak-model-pom + pom + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.jboss.as.plugins + jboss-as-maven-plugin + 7.1.1.Final + + true + + + + + + api + picketlink + jpa + + diff --git a/pom.xml b/pom.xml index e8447932a1..4600d51144 100755 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,7 @@ core + model services integration social diff --git a/services/pom.xml b/services/pom.xml index dce0df7d58..4d8075f8cc 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,6 +24,16 @@ ${project.version} provided + + org.keycloak + keycloak-model-api + ${project.version} + + + org.keycloak + keycloak-model-picketlink + ${project.version} + org.keycloak keycloak-social-core 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 50a095924f..a70e4573bf --- 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; /** 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 7fb20ebf93..93f59f9f74 --- 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; 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 126ef12bb3..6269b90ad7 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; 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 a72101aea9..11cd46caa7 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; 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 6506300a21..d6626619e0 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; 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 ce804973a6..fd1189f985 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; 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 a0c10e98d5..6192e0ff23 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; 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 5762c7bdc8..cc5cb2facb 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; 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 fd06088b6a..c3de829e81 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; 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 5da6c8c06c..a4d981cec7 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 Bill Burke 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 3831ce471d..60e3a98a27 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; 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 49cd813e7c..4d7a7ec2c8 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; 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 cfbdefa43c..8ca1511561 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; 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 104803ca39..49855b9af7 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; 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 e5550a0734..03b7d5f202 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; 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 a17537fd70..9914622862 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; 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 c559833b5d..64e3d13478 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 Bill Burke 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 18e3da6452..c13eb25eb1 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; 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 ec7410a576..0a80d029d0 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 Bill Burke 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 69188420bb..47d05709c9 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). 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 582ebae6c5..cb73b0ce9d 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; 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 549c4c1b67..a8a8afe580 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; 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 197432489e..97249dddab 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 Bill Burke 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 dc3b5124dd..b64fcfe64d 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.*; 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 1f06b0240c..dec17218d6 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; 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 a466f8490a..ddb1afe731 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; 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 aac82602b5..d45588a3bf 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; 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 25ba3d86ea..dafc11a4a9 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; 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 76870e0c5d..ce3ed3d8c1 --- 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; diff --git a/services/src/test/java/org/keycloak/services/models/utils/ArrayUtilsTest.java b/services/src/test/java/org/keycloak/services/models/utils/ArrayUtilsTest.java deleted file mode 100644 index e279737c81..0000000000 --- a/services/src/test/java/org/keycloak/services/models/utils/ArrayUtilsTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.keycloak.services.models.utils; - -import org.junit.Assert; -import org.junit.Test; - -public class ArrayUtilsTest { - - @Test - public void add() { - String[] a = new String[] { "a" }; - a = ArrayUtils.add(a, "b"); - Assert.assertArrayEquals(new String[] { "a", "b" }, a); - - a = ArrayUtils.add(a, "c"); - Assert.assertArrayEquals(new String[] { "a", "b", "c" }, a); - } - - @Test - public void remove() { - String[] a = new String[] { "a", "b", "c", "d" }; - - a = ArrayUtils.remove(a, "b"); - Assert.assertArrayEquals(new String[] { "a", "c", "d" }, a); - - a = ArrayUtils.remove(a, "d"); - Assert.assertArrayEquals(new String[] { "a", "c" }, a); - - a = ArrayUtils.remove(a, "a"); - Assert.assertArrayEquals(new String[] { "c" }, a); - - a = ArrayUtils.remove(a, "c"); - Assert.assertArrayEquals(new String[] {}, a); - } - -} diff --git a/services/src/test/java/org/keycloak/test/AdapterTest.java b/services/src/test/java/org/keycloak/test/AdapterTest.java index 581c1e8ae0..ec92f41fee 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; diff --git a/services/src/test/java/org/keycloak/test/ImportTest.java b/services/src/test/java/org/keycloak/test/ImportTest.java index 1a5f0a00b7..4b77a62f6f 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; diff --git a/services/src/test/java/org/keycloak/test/InstallationManager.java b/services/src/test/java/org/keycloak/test/InstallationManager.java index 64c3c212b9..1b1a68601b 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; /** 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 62fa870df6..a75fa76147 --- 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 { diff --git a/services/src/test/java/org/keycloak/test/RealmCreationTest.java b/services/src/test/java/org/keycloak/test/RealmCreationTest.java index c93c7429ab..a99042f6c5 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; diff --git a/services/src/test/resources/META-INF/persistence.xml b/services/src/test/resources/META-INF/persistence.xml index 0c8ed9eade..c17ec560a1 100755 --- a/services/src/test/resources/META-INF/persistence.xml +++ b/services/src/test/resources/META-INF/persistence.xml @@ -18,8 +18,8 @@ org.picketlink.idm.jpa.model.sample.simple.X509CredentialTypeEntity org.picketlink.idm.jpa.model.sample.simple.OTPCredentialTypeEntity org.picketlink.idm.jpa.model.sample.simple.AttributeTypeEntity - org.keycloak.services.models.picketlink.mappings.RealmEntity - org.keycloak.services.models.picketlink.mappings.ApplicationEntity + org.keycloak.models.picketlink.mappings.RealmEntity + org.keycloak.models.picketlink.mappings.ApplicationEntity true 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 7d38da7a95..8b27729aff --- 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; 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 da1b747c67..51ba94435e --- 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; 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 77c881406a..f4cb070c5f --- 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; 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 cf05276019..916513d7ea --- 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; 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 c1fe766de8..08a2bfa3e7 --- 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; 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 bcc0516583..b901c2e888 --- 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; 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 6587cab874..54451f428f --- 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; 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 e62c955f07..2cc0df9905 --- 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; 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 278e45c46a..7cb41787eb --- 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; diff --git a/testsuite/src/test/resources/META-INF/persistence.xml b/testsuite/src/test/resources/META-INF/persistence.xml index 0c8ed9eade..c17ec560a1 100755 --- a/testsuite/src/test/resources/META-INF/persistence.xml +++ b/testsuite/src/test/resources/META-INF/persistence.xml @@ -18,8 +18,8 @@ org.picketlink.idm.jpa.model.sample.simple.X509CredentialTypeEntity org.picketlink.idm.jpa.model.sample.simple.OTPCredentialTypeEntity org.picketlink.idm.jpa.model.sample.simple.AttributeTypeEntity - org.keycloak.services.models.picketlink.mappings.RealmEntity - org.keycloak.services.models.picketlink.mappings.ApplicationEntity + org.keycloak.models.picketlink.mappings.RealmEntity + org.keycloak.models.picketlink.mappings.ApplicationEntity true