diff --git a/connections/infinispan/pom.xml b/connections/infinispan/pom.xml index 788a53de1c..f32429ac8d 100755 --- a/connections/infinispan/pom.xml +++ b/connections/infinispan/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/connections/jpa-liquibase/pom.xml b/connections/jpa-liquibase/pom.xml index 6cd103f4fa..1564cd1855 100755 --- a/connections/jpa-liquibase/pom.xml +++ b/connections/jpa-liquibase/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.1.0.Beta1.xml b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.1.0.Beta1.xml index c94b2062ca..577ae56f93 100755 --- a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.1.0.Beta1.xml +++ b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.1.0.Beta1.xml @@ -46,7 +46,7 @@ - + diff --git a/connections/jpa/pom.xml b/connections/jpa/pom.xml index efd62cb2cd..0dbcaf6b77 100755 --- a/connections/jpa/pom.xml +++ b/connections/jpa/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/connections/mongo/pom.xml b/connections/mongo/pom.xml index ec71154dea..788938362e 100755 --- a/connections/mongo/pom.xml +++ b/connections/mongo/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/connections/pom.xml b/connections/pom.xml index 2d284bb5f2..f64e0ad27b 100755 --- a/connections/pom.xml +++ b/connections/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT Connections Parent diff --git a/core-jaxrs/pom.xml b/core-jaxrs/pom.xml index b114fdc871..b17413bc11 100755 --- a/core-jaxrs/pom.xml +++ b/core-jaxrs/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index 50be226157..5e52133bbe 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 1b3a085335..e08a34db6f 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT 4.0.0 diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml index 9c20bd459d..f5023a9ba9 100755 --- a/dependencies/server-all/pom.xml +++ b/dependencies/server-all/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml index 6494377916..8e80d718ee 100755 --- a/dependencies/server-min/pom.xml +++ b/dependencies/server-min/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/distribution/appliance-dist/pom.xml b/distribution/appliance-dist/pom.xml index 28105f6876..91707b7c77 100755 --- a/distribution/appliance-dist/pom.xml +++ b/distribution/appliance-dist/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/distribution/as7-adapter-zip/pom.xml b/distribution/as7-adapter-zip/pom.xml index 9ef45d78f0..a6b5f32141 100755 --- a/distribution/as7-adapter-zip/pom.xml +++ b/distribution/as7-adapter-zip/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/distribution/eap6-adapter-zip/pom.xml b/distribution/eap6-adapter-zip/pom.xml index eefe37399e..8f1ddf594b 100755 --- a/distribution/eap6-adapter-zip/pom.xml +++ b/distribution/eap6-adapter-zip/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/distribution/examples-docs-zip/build.xml b/distribution/examples-docs-zip/build.xml index a33d88d58c..16f93f5546 100755 --- a/distribution/examples-docs-zip/build.xml +++ b/distribution/examples-docs-zip/build.xml @@ -50,6 +50,14 @@ + + + + + + + + diff --git a/distribution/examples-docs-zip/pom.xml b/distribution/examples-docs-zip/pom.xml index a36e8ba2ba..b783a7a5de 100755 --- a/distribution/examples-docs-zip/pom.xml +++ b/distribution/examples-docs-zip/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml index 6d8a003b67..afc41ed6fb 100755 --- a/distribution/modules/pom.xml +++ b/distribution/modules/pom.xml @@ -30,7 +30,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index be012faa88..973bc6e44f 100755 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml Distribution diff --git a/distribution/src-dist/pom.xml b/distribution/src-dist/pom.xml index 1e968c0a5d..87e866f8ab 100755 --- a/distribution/src-dist/pom.xml +++ b/distribution/src-dist/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/distribution/theme-template-zip/pom.xml b/distribution/theme-template-zip/pom.xml index cf111d3296..1507ca7833 100755 --- a/distribution/theme-template-zip/pom.xml +++ b/distribution/theme-template-zip/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/distribution/tomcat7-adapter-zip/pom.xml b/distribution/tomcat7-adapter-zip/pom.xml index 52b829c854..cc6e4260c0 100755 --- a/distribution/tomcat7-adapter-zip/pom.xml +++ b/distribution/tomcat7-adapter-zip/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/distribution/war-dist/pom.xml b/distribution/war-dist/pom.xml index fb03295df7..06c3e70fcc 100755 --- a/distribution/war-dist/pom.xml +++ b/distribution/war-dist/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/distribution/war-zip/pom.xml b/distribution/war-zip/pom.xml index 39103b7397..de40f39d94 100755 --- a/distribution/war-zip/pom.xml +++ b/distribution/war-zip/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/distribution/wildfly-adapter-zip/pom.xml b/distribution/wildfly-adapter-zip/pom.xml index 6b5197d22b..e78caf351c 100755 --- a/distribution/wildfly-adapter-zip/pom.xml +++ b/distribution/wildfly-adapter-zip/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/docbook/pom.xml b/docbook/pom.xml index 29d73eaa58..03cb42cb1a 100755 --- a/docbook/pom.xml +++ b/docbook/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml index 9b4413af09..1fae98c859 100755 --- a/docbook/reference/en/en-US/modules/server-installation.xml +++ b/docbook/reference/en/en-US/modules/server-installation.xml @@ -70,7 +70,7 @@ keycloak-appliance-dist-all-&project.version;/ keycloak-war-dist-all-&project.version;.zip contains just the bits you need to install keycloak on your favorite web container. We currently only support - installing it on top of an existing JBoss AS 7.1.1, JBoss EAP 6.x, or Wildfly 8 distribution. We may in the + installing it on top of an existing Wildfly 8, JBoss EAP 6.x or JBoss AS 7.1.1 distribution. We may in the future provide directions on how to install it on another web container like Tomcat or Jetty. If anybody in the community is interested in pulling this together, please contact us. Its mostly Maven pom work. @@ -121,7 +121,7 @@ keycloak-war-dist-all-&project.version;/ enter in a new password. - If you have Keycloak on JBoss AS 7.1.1 or EAP 6.2 make sure to follow these steps. + If you have Keycloak on JBoss AS 7.1.1 these steps.
@@ -393,9 +393,9 @@ keycloak-war-dist-all-&project.version;/
- AS7/EAP6.x specifics + AS7 specifics - If you have Keycloak on JBoss AS 7.1.1 or JBoss EAP 6.2, you need to do few other things in order to have Keycloak up and running. This includes: + If you have Keycloak on JBoss AS 7.1.1 you need to do few other things in order to have Keycloak up and running. This includes: diff --git a/events/api/pom.xml b/events/api/pom.xml index 31aa0fcae0..d7dd843619 100755 --- a/events/api/pom.xml +++ b/events/api/pom.xml @@ -3,7 +3,7 @@ keycloak-events-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT 4.0.0 diff --git a/events/email/pom.xml b/events/email/pom.xml index 76c2be0eeb..2d700658b0 100755 --- a/events/email/pom.xml +++ b/events/email/pom.xml @@ -3,7 +3,7 @@ keycloak-events-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT 4.0.0 diff --git a/events/jboss-logging/pom.xml b/events/jboss-logging/pom.xml index 65c7787e93..99b1d840ab 100755 --- a/events/jboss-logging/pom.xml +++ b/events/jboss-logging/pom.xml @@ -3,7 +3,7 @@ keycloak-events-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT 4.0.0 diff --git a/events/jpa/pom.xml b/events/jpa/pom.xml index f14fa91244..94581841d8 100755 --- a/events/jpa/pom.xml +++ b/events/jpa/pom.xml @@ -3,7 +3,7 @@ keycloak-events-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT 4.0.0 diff --git a/events/mongo/pom.xml b/events/mongo/pom.xml index 8e817945fd..0082d93450 100755 --- a/events/mongo/pom.xml +++ b/events/mongo/pom.xml @@ -3,7 +3,7 @@ keycloak-events-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT 4.0.0 diff --git a/events/pom.xml b/events/pom.xml index 5744258e27..ff7a7aac2d 100755 --- a/events/pom.xml +++ b/events/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml diff --git a/examples/README.md b/examples/README.md index cc4235483d..fd88529392 100755 --- a/examples/README.md +++ b/examples/README.md @@ -14,6 +14,12 @@ This is the our main example, which shows Login, Single-Sign On, Single-Sign Out For more information look at `preconfigured-demo/README.md` or `unconfigured-demo/README.md`. For the unconfigured-demo there's an accompanying screencast at [http://keycloak.org/docs](http://keycloak.org/docs) that walks you through the setup process. +Admin Client +------------ + +Example using the Admin Client. For more information look at `admin-client/README.md`. + + Cordova ------- diff --git a/examples/admin-client/README.md b/examples/admin-client/README.md new file mode 100644 index 0000000000..7279c57894 --- /dev/null +++ b/examples/admin-client/README.md @@ -0,0 +1,17 @@ +Admin Client Example +==================== + +Start and configure Keycloak +---------------------------- + +Start Keycloak: + + bin/standalone.sh + +Open the Keycloak admin console, click on Add Realm, click on 'Choose a JSON file', selct example-realm.json and click Upload. + +Deploy the Admin Client Example to Keycloak by running: + + mvn install wildfly:deploy + +Open the console at http://localhost:8080/examples-admin-client. The page should list all applications in the example realm, with a link to the applications that have a baseUrl configured. diff --git a/examples/admin-client/example-realm.json b/examples/admin-client/example-realm.json new file mode 100755 index 0000000000..2615e56676 --- /dev/null +++ b/examples/admin-client/example-realm.json @@ -0,0 +1,37 @@ +{ + "realm": "example", + "enabled": true, + "sslRequired": "external", + "registrationAllowed": true, + "passwordCredentialGrantAllowed": true, + "privateKey": "MIICXAIBAAKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQABAoGAfmO8gVhyBxdqlxmIuglbz8bcjQbhXJLR2EoS8ngTXmN1bo2L90M0mUKSdc7qF10LgETBzqL8jYlQIbt+e6TH8fcEpKCjUlyq0Mf/vVbfZSNaVycY13nTzo27iPyWQHK5NLuJzn1xvxxrUeXI6A2WFpGEBLbHjwpx5WQG9A+2scECQQDvdn9NE75HPTVPxBqsEd2z10TKkl9CZxu10Qby3iQQmWLEJ9LNmy3acvKrE3gMiYNWb6xHPKiIqOR1as7L24aTAkEAtyvQOlCvr5kAjVqrEKXalj0Tzewjweuxc0pskvArTI2Oo070h65GpoIKLc9jf+UA69cRtquwP93aZKtW06U8dQJAF2Y44ks/mK5+eyDqik3koCI08qaC8HYq2wVl7G2QkJ6sbAaILtcvD92ToOvyGyeE0flvmDZxMYlvaZnaQ0lcSQJBAKZU6umJi3/xeEbkJqMfeLclD27XGEFoPeNrmdx0q10Azp4NfJAY+Z8KRyQCR2BEG+oNitBOZ+YXF9KCpH3cdmECQHEigJhYg+ykOvr1aiZUMFT72HU0jnmQe2FVekuG+LJUt2Tm7GtMjTFoGpf0JwrVuZN39fOYAlo+nTixgeW7X8Y=", + "publicKey": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB", + "requiredCredentials": [ "password" ], + "users": [ + { + "username": "examples-admin-client", + "enabled": true, + "credentials": [ + { + "type": "password", + "value": "password" + } + ], + "applicationRoles": { + "realm-management": [ "realm-admin" ] + } + } + ], + "applications": [ + { + "name": "examples-admin-client", + "enabled": true, + "fullScopeAllowed": true, + "baseUrl": "/examples-admin-client", + "redirectUris": [ + "/examples-admin-client/*" + ], + "secret": "password" + } + ] +} diff --git a/examples/admin-client/pom.xml b/examples/admin-client/pom.xml new file mode 100644 index 0000000000..d1bc91ca7f --- /dev/null +++ b/examples/admin-client/pom.xml @@ -0,0 +1,56 @@ + + 4.0.0 + + + keycloak-parent + org.keycloak + 1.1.0.Beta2-SNAPSHOT + ../../pom.xml + + + Keycloak Examples - Admin Client + examples-admin-client + war + + + Keycloak Admin Client Example + + + + + org.keycloak + keycloak-admin-client + ${project.version} + + + + + ${project.artifactId} + + + org.jboss.as.plugins + jboss-as-maven-plugin + + false + + + + org.wildfly.plugins + wildfly-maven-plugin + + false + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + diff --git a/examples/admin-client/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/examples/admin-client/src/main/webapp/WEB-INF/jboss-deployment-structure.xml new file mode 100755 index 0000000000..1ef0bb43a6 --- /dev/null +++ b/examples/admin-client/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/examples/admin-client/src/main/webapp/WEB-INF/web.xml b/examples/admin-client/src/main/webapp/WEB-INF/web.xml new file mode 100755 index 0000000000..c8dab296f1 --- /dev/null +++ b/examples/admin-client/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,9 @@ + + + + examples-admin-client + + diff --git a/examples/admin-client/src/main/webapp/index.jsp b/examples/admin-client/src/main/webapp/index.jsp new file mode 100644 index 0000000000..13b6eee183 --- /dev/null +++ b/examples/admin-client/src/main/webapp/index.jsp @@ -0,0 +1,33 @@ +<%@ page import="org.keycloak.admin.client.Keycloak" %> +<%@ page import="org.keycloak.admin.client.resource.ApplicationsResource" %> +<%@ page import="org.keycloak.representations.idm.ApplicationRepresentation" %> +<%@ page import="org.keycloak.util.UriUtils" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %> +<%@ page session="false" %> + + + Applications + + +<% + String authServer = UriUtils.getOrigin(request.getRequestURL().toString()) + "/auth"; + + Keycloak keycloak = Keycloak.getInstance(authServer, "example", "examples-admin-client", "password", "examples-admin-client", "password"); + ApplicationsResource applications = keycloak.realm("example").applications(); + + out.println("

Applications

"); + out.println("
    "); + for (ApplicationRepresentation app : applications.findAll()) { + out.println("\t
  • "); + if (app.getBaseUrl() != null) { + out.println("\t\t" + app.getName() + ""); + } else { + out.println("\t\t" + app.getName()); + } + out.println("
    • "); + } + out.println("
"); +%> +

+ + diff --git a/examples/cors/angular-product-app/pom.xml b/examples/cors/angular-product-app/pom.xml index 175e4073e0..0256fd6cd5 100755 --- a/examples/cors/angular-product-app/pom.xml +++ b/examples/cors/angular-product-app/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/cors/database-service/pom.xml b/examples/cors/database-service/pom.xml index 49ee7362ce..2e032bf0f2 100755 --- a/examples/cors/database-service/pom.xml +++ b/examples/cors/database-service/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/cors/pom.xml b/examples/cors/pom.xml index 9b1c0487ee..dd5d4c64d1 100755 --- a/examples/cors/pom.xml +++ b/examples/cors/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml Keycloak Examples - CORS diff --git a/examples/demo-template/admin-access-app/pom.xml b/examples/demo-template/admin-access-app/pom.xml index e766f812af..260c864a0a 100755 --- a/examples/demo-template/admin-access-app/pom.xml +++ b/examples/demo-template/admin-access-app/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/angular-product-app/pom.xml b/examples/demo-template/angular-product-app/pom.xml index ac624a84c0..12657d3ed0 100755 --- a/examples/demo-template/angular-product-app/pom.xml +++ b/examples/demo-template/angular-product-app/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/customer-app-cli/pom.xml b/examples/demo-template/customer-app-cli/pom.xml index 7961ec5835..84bba2494a 100755 --- a/examples/demo-template/customer-app-cli/pom.xml +++ b/examples/demo-template/customer-app-cli/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/customer-app-js/pom.xml b/examples/demo-template/customer-app-js/pom.xml index 53774a4909..d1e0adcf7c 100755 --- a/examples/demo-template/customer-app-js/pom.xml +++ b/examples/demo-template/customer-app-js/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/customer-app/pom.xml b/examples/demo-template/customer-app/pom.xml index 2f8e4ff079..6202c4a5d6 100755 --- a/examples/demo-template/customer-app/pom.xml +++ b/examples/demo-template/customer-app/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/database-service/pom.xml b/examples/demo-template/database-service/pom.xml index 4ad2ca28d6..f1d50ccb80 100755 --- a/examples/demo-template/database-service/pom.xml +++ b/examples/demo-template/database-service/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/example-ear/pom.xml b/examples/demo-template/example-ear/pom.xml index e8e0950de2..1cd2488987 100755 --- a/examples/demo-template/example-ear/pom.xml +++ b/examples/demo-template/example-ear/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/pom.xml b/examples/demo-template/pom.xml index 07a58d26c0..944c50d3f9 100755 --- a/examples/demo-template/pom.xml +++ b/examples/demo-template/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml Examples diff --git a/examples/demo-template/product-app/pom.xml b/examples/demo-template/product-app/pom.xml index 27b19ddd18..41537b11f5 100755 --- a/examples/demo-template/product-app/pom.xml +++ b/examples/demo-template/product-app/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/third-party-cdi/pom.xml b/examples/demo-template/third-party-cdi/pom.xml index 6934037d6d..cfa40548df 100755 --- a/examples/demo-template/third-party-cdi/pom.xml +++ b/examples/demo-template/third-party-cdi/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/third-party/pom.xml b/examples/demo-template/third-party/pom.xml index 29fc8d3e0f..3786aa79e3 100755 --- a/examples/demo-template/third-party/pom.xml +++ b/examples/demo-template/third-party/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/examples/js-console/pom.xml b/examples/js-console/pom.xml index d07489b8da..e64e4c5830 100755 --- a/examples/js-console/pom.xml +++ b/examples/js-console/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/examples/multi-tenant/pom.xml b/examples/multi-tenant/pom.xml index 653632c5de..531589121a 100644 --- a/examples/multi-tenant/pom.xml +++ b/examples/multi-tenant/pom.xml @@ -4,12 +4,12 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml Keycloak Examples - Multi Tenant - multitenant + examples-multitenant war @@ -59,7 +59,30 @@ - ${project.artifactId} + multitenant + + + org.jboss.as.plugins + jboss-as-maven-plugin + + false + + + + org.wildfly.plugins + wildfly-maven-plugin + + false + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + diff --git a/examples/multi-tenant/tenant1-realm.json b/examples/multi-tenant/tenant1-realm.json index 76acce85ff..dc41441445 100644 --- a/examples/multi-tenant/tenant1-realm.json +++ b/examples/multi-tenant/tenant1-realm.json @@ -46,10 +46,10 @@ { "name": "multi-tenant", "enabled": true, - "adminUrl": "http://localhost:8080/multitenant/tenant1", - "baseUrl": "http://localhost:8080/multitenant/tenant1", + "adminUrl": "/multitenant/tenant1", + "baseUrl": "/multitenant/tenant1", "redirectUris": [ - "http://localhost:8080/multitenant/tenant1/*" + "/multitenant/tenant1/*" ], "secret": "password" } diff --git a/examples/multi-tenant/tenant2-realm.json b/examples/multi-tenant/tenant2-realm.json index 295cb3f4d3..e19509d954 100644 --- a/examples/multi-tenant/tenant2-realm.json +++ b/examples/multi-tenant/tenant2-realm.json @@ -46,10 +46,10 @@ { "name": "multi-tenant", "enabled": true, - "adminUrl": "http://localhost:8080/multitenant/tenant2", - "baseUrl": "http://localhost:8080/multitenant/tenant2", + "adminUrl": "/multitenant/tenant2", + "baseUrl": "/multitenant/tenant2", "redirectUris": [ - "http://localhost:8080/multitenant/tenant2/*" + "/multitenant/tenant2/*" ], "secret": "password" } diff --git a/examples/pom.xml b/examples/pom.xml index 7ec8a316fd..61c47af28b 100755 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml Examples @@ -25,6 +25,7 @@ + admin-client cors demo-template providers diff --git a/examples/providers/event-listener-sysout/pom.xml b/examples/providers/event-listener-sysout/pom.xml index 39bdf08f45..cd9f2efa38 100755 --- a/examples/providers/event-listener-sysout/pom.xml +++ b/examples/providers/event-listener-sysout/pom.xml @@ -3,7 +3,7 @@ examples-providers-pom org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml Event Listener System.out Example diff --git a/examples/providers/event-store-mem/pom.xml b/examples/providers/event-store-mem/pom.xml index 1155239f07..34b5b33a06 100755 --- a/examples/providers/event-store-mem/pom.xml +++ b/examples/providers/event-store-mem/pom.xml @@ -3,7 +3,7 @@ examples-providers-pom org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml Event Store In-Mem Example diff --git a/examples/providers/federation-provider/pom.xml b/examples/providers/federation-provider/pom.xml index f1c43bb9f1..fccc6d8bc1 100755 --- a/examples/providers/federation-provider/pom.xml +++ b/examples/providers/federation-provider/pom.xml @@ -3,7 +3,7 @@ examples-providers-pom org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml Properties Authentication Provider Example diff --git a/examples/providers/pom.xml b/examples/providers/pom.xml index 6dac05bc5c..aec70ab376 100755 --- a/examples/providers/pom.xml +++ b/examples/providers/pom.xml @@ -3,7 +3,7 @@ examples-pom org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml Provider Examples diff --git a/export-import/export-import-api/pom.xml b/export-import/export-import-api/pom.xml index e47f890a02..47394ec9c0 100755 --- a/export-import/export-import-api/pom.xml +++ b/export-import/export-import-api/pom.xml @@ -4,7 +4,7 @@ keycloak-export-import-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/export-import/export-import-dir/pom.xml b/export-import/export-import-dir/pom.xml index 3251548840..d7e76eddd7 100755 --- a/export-import/export-import-dir/pom.xml +++ b/export-import/export-import-dir/pom.xml @@ -4,7 +4,7 @@ keycloak-export-import-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/export-import/export-import-single-file/pom.xml b/export-import/export-import-single-file/pom.xml index df253699b2..cbc67b1d00 100755 --- a/export-import/export-import-single-file/pom.xml +++ b/export-import/export-import-single-file/pom.xml @@ -4,7 +4,7 @@ keycloak-export-import-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/export-import/export-import-zip/pom.xml b/export-import/export-import-zip/pom.xml index da911770b4..c0ff95b8a1 100755 --- a/export-import/export-import-zip/pom.xml +++ b/export-import/export-import-zip/pom.xml @@ -4,7 +4,7 @@ keycloak-export-import-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/export-import/pom.xml b/export-import/pom.xml index 23defa03f8..83eae0b8a3 100755 --- a/export-import/pom.xml +++ b/export-import/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/federation/ldap/pom.xml b/federation/ldap/pom.xml index bf335c2b1c..b0d7969f67 100755 --- a/federation/ldap/pom.xml +++ b/federation/ldap/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/federation/pom.xml b/federation/pom.xml index 32c0b104a2..89f1fedd0a 100755 --- a/federation/pom.xml +++ b/federation/pom.xml @@ -5,7 +5,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml index e9a4f3f901..ea997feba2 100755 --- a/forms/account-api/pom.xml +++ b/forms/account-api/pom.xml @@ -4,7 +4,7 @@ keycloak-forms-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/forms/account-freemarker/pom.xml b/forms/account-freemarker/pom.xml index f274944a73..c7a31d2684 100755 --- a/forms/account-freemarker/pom.xml +++ b/forms/account-freemarker/pom.xml @@ -4,7 +4,7 @@ keycloak-forms-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/forms/common-freemarker/pom.xml b/forms/common-freemarker/pom.xml index 09cca72a8c..734b7353b5 100755 --- a/forms/common-freemarker/pom.xml +++ b/forms/common-freemarker/pom.xml @@ -4,7 +4,7 @@ keycloak-forms-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml index 176e6fb92b..821c9615a0 100755 --- a/forms/common-themes/pom.xml +++ b/forms/common-themes/pom.xml @@ -4,7 +4,7 @@ keycloak-forms-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/forms/email-api/pom.xml b/forms/email-api/pom.xml index 6f1485ce6f..8f0d0dfc67 100755 --- a/forms/email-api/pom.xml +++ b/forms/email-api/pom.xml @@ -4,7 +4,7 @@ keycloak-forms-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/forms/email-freemarker/pom.xml b/forms/email-freemarker/pom.xml index a63adeb089..db1315e038 100755 --- a/forms/email-freemarker/pom.xml +++ b/forms/email-freemarker/pom.xml @@ -4,7 +4,7 @@ keycloak-forms-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/forms/login-api/pom.xml b/forms/login-api/pom.xml index 7acf62580c..bb45def929 100755 --- a/forms/login-api/pom.xml +++ b/forms/login-api/pom.xml @@ -4,7 +4,7 @@ keycloak-forms-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/forms/login-freemarker/pom.xml b/forms/login-freemarker/pom.xml index 4d0f69edb9..47d7342c19 100755 --- a/forms/login-freemarker/pom.xml +++ b/forms/login-freemarker/pom.xml @@ -4,7 +4,7 @@ keycloak-forms-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/forms/pom.xml b/forms/pom.xml index 337b3ea48b..8db864762e 100755 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/integration/adapter-core/pom.xml b/integration/adapter-core/pom.xml index 07a4cccfc8..9262be18d3 100755 --- a/integration/adapter-core/pom.xml +++ b/integration/adapter-core/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/integration/admin-client/pom.xml b/integration/admin-client/pom.xml index 7419d8f274..6aa8a2d818 100755 --- a/integration/admin-client/pom.xml +++ b/integration/admin-client/pom.xml @@ -5,7 +5,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 @@ -23,31 +23,37 @@ org.codehaus.jackson jackson-mapper-asl + provided org.apache.httpcomponents httpclient ${keycloak.apache.httpcomponents.version} + provided org.jboss.resteasy jaxrs-api ${resteasy.version.latest} + provided org.jboss.resteasy resteasy-jaxrs ${resteasy.version.latest} + provided org.jboss.resteasy resteasy-client ${resteasy.version.latest} + provided org.jboss.resteasy resteasy-jackson-provider ${resteasy.version.latest} + provided diff --git a/integration/as7-eap-subsystem/pom.xml b/integration/as7-eap-subsystem/pom.xml index 53f32e82b1..642fefa7d1 100755 --- a/integration/as7-eap-subsystem/pom.xml +++ b/integration/as7-eap-subsystem/pom.xml @@ -20,7 +20,7 @@ org.keycloak keycloak-parent - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/integration/as7-eap6/adapter/pom.xml b/integration/as7-eap6/adapter/pom.xml index 84a7104aae..48c9a536e0 100755 --- a/integration/as7-eap6/adapter/pom.xml +++ b/integration/as7-eap6/adapter/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/integration/installed/pom.xml b/integration/installed/pom.xml index 4d822c2c28..6c4a60377e 100755 --- a/integration/installed/pom.xml +++ b/integration/installed/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/integration/jaxrs-oauth-client/pom.xml b/integration/jaxrs-oauth-client/pom.xml index 21e94f703a..ef9bc1b388 100755 --- a/integration/jaxrs-oauth-client/pom.xml +++ b/integration/jaxrs-oauth-client/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/integration/jboss-adapter-core/pom.xml b/integration/jboss-adapter-core/pom.xml index 54a61a02af..f9359f0f1b 100755 --- a/integration/jboss-adapter-core/pom.xml +++ b/integration/jboss-adapter-core/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/integration/js/pom.xml b/integration/js/pom.xml index 0a69fc657a..ee5557b982 100755 --- a/integration/js/pom.xml +++ b/integration/js/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/integration/pom.xml b/integration/pom.xml index 42121e94a2..0b7203abcc 100755 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml Keycloak Integration diff --git a/integration/servlet-oauth-client/pom.xml b/integration/servlet-oauth-client/pom.xml index 8b5e73d7d1..37c0d50a59 100755 --- a/integration/servlet-oauth-client/pom.xml +++ b/integration/servlet-oauth-client/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/integration/tomcat7/adapter/pom.xml b/integration/tomcat7/adapter/pom.xml index 5b32cd5029..091a22bf92 100755 --- a/integration/tomcat7/adapter/pom.xml +++ b/integration/tomcat7/adapter/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/integration/undertow/pom.xml b/integration/undertow/pom.xml index cf52b629df..bb5633faa4 100755 --- a/integration/undertow/pom.xml +++ b/integration/undertow/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/integration/wildfly-adapter/pom.xml b/integration/wildfly-adapter/pom.xml index 64f726a63a..62a758e34a 100755 --- a/integration/wildfly-adapter/pom.xml +++ b/integration/wildfly-adapter/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/integration/wildfly-subsystem/pom.xml b/integration/wildfly-subsystem/pom.xml index 19d6352d9a..d776e6006a 100755 --- a/integration/wildfly-subsystem/pom.xml +++ b/integration/wildfly-subsystem/pom.xml @@ -20,7 +20,7 @@ org.keycloak keycloak-parent - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/model/api/pom.xml b/model/api/pom.xml index 83248d4687..b5c19755e9 100755 --- a/model/api/pom.xml +++ b/model/api/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/model/invalidation-cache/infinispan/pom.xml b/model/invalidation-cache/infinispan/pom.xml index f03fd7a78b..4792d76d85 100755 --- a/model/invalidation-cache/infinispan/pom.xml +++ b/model/invalidation-cache/infinispan/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/model/invalidation-cache/model-adapters/pom.xml b/model/invalidation-cache/model-adapters/pom.xml index f389f5f161..f8a3875cff 100755 --- a/model/invalidation-cache/model-adapters/pom.xml +++ b/model/invalidation-cache/model-adapters/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/model/invalidation-cache/pom.xml b/model/invalidation-cache/pom.xml index e24a15d6f3..b66b53ef2c 100755 --- a/model/invalidation-cache/pom.xml +++ b/model/invalidation-cache/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml Model Parent diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml index ae6bfe37e5..a084184ac0 100755 --- a/model/jpa/pom.xml +++ b/model/jpa/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/model/mongo/pom.xml b/model/mongo/pom.xml index d0e4e7d74b..aec4f03028 100755 --- a/model/mongo/pom.xml +++ b/model/mongo/pom.xml @@ -5,7 +5,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/model/pom.xml b/model/pom.xml index 6296e15989..b1e9fc1ac5 100755 --- a/model/pom.xml +++ b/model/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml Model Parent diff --git a/model/sessions-infinispan/pom.xml b/model/sessions-infinispan/pom.xml index 9462f7aa34..3f184d4de9 100755 --- a/model/sessions-infinispan/pom.xml +++ b/model/sessions-infinispan/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/model/sessions-jpa/pom.xml b/model/sessions-jpa/pom.xml index 192580d866..3784855f08 100755 --- a/model/sessions-jpa/pom.xml +++ b/model/sessions-jpa/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/model/sessions-mem/pom.xml b/model/sessions-mem/pom.xml index 38edb30d14..615e3d5fe1 100755 --- a/model/sessions-mem/pom.xml +++ b/model/sessions-mem/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/model/sessions-mongo/pom.xml b/model/sessions-mongo/pom.xml index 9939422bfa..ddcdb88e3a 100755 --- a/model/sessions-mongo/pom.xml +++ b/model/sessions-mongo/pom.xml @@ -5,7 +5,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/picketlink/keycloak-picketlink-api/pom.xml b/picketlink/keycloak-picketlink-api/pom.xml index 834c3e0e42..59c28f82cc 100755 --- a/picketlink/keycloak-picketlink-api/pom.xml +++ b/picketlink/keycloak-picketlink-api/pom.xml @@ -5,7 +5,7 @@ keycloak-picketlink-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/picketlink/keycloak-picketlink-ldap/pom.xml b/picketlink/keycloak-picketlink-ldap/pom.xml index e481ab53ad..05cd62828c 100755 --- a/picketlink/keycloak-picketlink-ldap/pom.xml +++ b/picketlink/keycloak-picketlink-ldap/pom.xml @@ -5,7 +5,7 @@ keycloak-picketlink-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/picketlink/pom.xml b/picketlink/pom.xml index e69c78e1d9..5f766bf86f 100755 --- a/picketlink/pom.xml +++ b/picketlink/pom.xml @@ -5,7 +5,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 430aea1b95..f6164ff828 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.keycloak keycloak-parent - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT pom diff --git a/project-integrations/aerogear-ups/app/pom.xml b/project-integrations/aerogear-ups/app/pom.xml index ef2e269cbd..39a6b84c89 100755 --- a/project-integrations/aerogear-ups/app/pom.xml +++ b/project-integrations/aerogear-ups/app/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml diff --git a/project-integrations/aerogear-ups/auth-server/pom.xml b/project-integrations/aerogear-ups/auth-server/pom.xml index 58f002eb12..ed5ed9ce68 100755 --- a/project-integrations/aerogear-ups/auth-server/pom.xml +++ b/project-integrations/aerogear-ups/auth-server/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../../pom.xml diff --git a/project-integrations/aerogear-ups/pom.xml b/project-integrations/aerogear-ups/pom.xml index f84a8083cc..b09abcc501 100755 --- a/project-integrations/aerogear-ups/pom.xml +++ b/project-integrations/aerogear-ups/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml Aerogear UPS Parent diff --git a/project-integrations/pom.xml b/project-integrations/pom.xml index 8433d06773..aa67f81db6 100755 --- a/project-integrations/pom.xml +++ b/project-integrations/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml Third-party Integration Parent diff --git a/saml/pom.xml b/saml/pom.xml index 4e7a81f5f5..896dc7f65d 100755 --- a/saml/pom.xml +++ b/saml/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml Keycloak SAML Integration diff --git a/saml/saml-core/pom.xml b/saml/saml-core/pom.xml index 87b0250721..037e24128c 100755 --- a/saml/saml-core/pom.xml +++ b/saml/saml-core/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/saml/saml-protocol/pom.xml b/saml/saml-protocol/pom.xml index 7e9c389ff2..25965ac7ca 100755 --- a/saml/saml-protocol/pom.xml +++ b/saml/saml-protocol/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/server/pom.xml b/server/pom.xml index 30c3d3bb28..d38b58055c 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT 4.0.0 diff --git a/services/pom.xml b/services/pom.xml index e2390b7286..4597393cec 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java index 4434a544bc..7297f31760 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java @@ -124,6 +124,10 @@ public class TokenManager { } public static void attachClientSession(UserSessionModel session, ClientSessionModel clientSession) { + if (clientSession.getUserSession() != null) { + return; + } + UserModel user = session.getUser(); clientSession.setUserSession(session); Set requestedRoles = new HashSet(); diff --git a/social/core/pom.xml b/social/core/pom.xml index cf11cff8a4..ff33cf19af 100755 --- a/social/core/pom.xml +++ b/social/core/pom.xml @@ -4,7 +4,7 @@ keycloak-social-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/social/facebook/pom.xml b/social/facebook/pom.xml index 69c48c0e10..373ba87094 100755 --- a/social/facebook/pom.xml +++ b/social/facebook/pom.xml @@ -3,7 +3,7 @@ keycloak-social-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/social/github/pom.xml b/social/github/pom.xml index 351f4b142f..7febd53266 100755 --- a/social/github/pom.xml +++ b/social/github/pom.xml @@ -3,7 +3,7 @@ keycloak-social-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/social/google/pom.xml b/social/google/pom.xml index a1ca18974e..e1f25cb38e 100755 --- a/social/google/pom.xml +++ b/social/google/pom.xml @@ -4,7 +4,7 @@ keycloak-social-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/social/pom.xml b/social/pom.xml index 5a98465ae0..c20ae32922 100755 --- a/social/pom.xml +++ b/social/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/social/twitter/pom.xml b/social/twitter/pom.xml index dd3f14e960..21848ea286 100755 --- a/social/twitter/pom.xml +++ b/social/twitter/pom.xml @@ -4,7 +4,7 @@ keycloak-social-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml index 1e9f25a5bf..77252b9986 100755 --- a/testsuite/integration/pom.xml +++ b/testsuite/integration/pom.xml @@ -4,7 +4,7 @@ keycloak-testsuite-pom org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java index c6df988c07..d94914c7f3 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java @@ -59,6 +59,10 @@ public class MultiTenancyTest { deployApplication("multi-tenant", "/multi-tenant", MultiTenantServlet.class, null, "user", true, MultiTenantResolver.class); } + + protected String[] getTestRealms() { + return new String[]{"test", "demo", "tenant1", "tenant2"}; + } }; /** diff --git a/testsuite/performance-web/pom.xml b/testsuite/performance-web/pom.xml index a1b6565dfc..6bcc54068e 100755 --- a/testsuite/performance-web/pom.xml +++ b/testsuite/performance-web/pom.xml @@ -4,7 +4,7 @@ keycloak-testsuite-pom org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/testsuite/performance/pom.xml b/testsuite/performance/pom.xml index 70e2cef4a0..32899bdd9b 100755 --- a/testsuite/performance/pom.xml +++ b/testsuite/performance/pom.xml @@ -5,7 +5,7 @@ keycloak-testsuite-pom org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 9c2186d993..5e63ce62df 100755 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/testsuite/tomcat7/pom.xml b/testsuite/tomcat7/pom.xml index f53a489b7b..c243710d16 100755 --- a/testsuite/tomcat7/pom.xml +++ b/testsuite/tomcat7/pom.xml @@ -4,7 +4,7 @@ keycloak-testsuite-pom org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/testsuite/tools/pom.xml b/testsuite/tools/pom.xml index d6b9e75c88..90e92f4130 100755 --- a/testsuite/tools/pom.xml +++ b/testsuite/tools/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../../pom.xml diff --git a/timer/api/pom.xml b/timer/api/pom.xml index 5920de0416..7133d45d77 100755 --- a/timer/api/pom.xml +++ b/timer/api/pom.xml @@ -3,7 +3,7 @@ keycloak-timer-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT 4.0.0 diff --git a/timer/basic/pom.xml b/timer/basic/pom.xml index 05a437da70..52380de300 100755 --- a/timer/basic/pom.xml +++ b/timer/basic/pom.xml @@ -3,7 +3,7 @@ keycloak-timer-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT 4.0.0 diff --git a/timer/pom.xml b/timer/pom.xml index 2a5d119b31..7ff2b3155b 100755 --- a/timer/pom.xml +++ b/timer/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.1.0-Alpha1-SNAPSHOT + 1.1.0.Beta2-SNAPSHOT ../pom.xml