From dcbdb59e00e1d44f1d93b13638fcdd53373eac48 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 4 May 2015 15:33:06 +0200 Subject: [PATCH 1/5] Updated instructions to deploy cors to use wildfly --- examples/cors/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cors/README.md b/examples/cors/README.md index 89ac4a85fd..f2de71f2df 100755 --- a/examples/cors/README.md +++ b/examples/cors/README.md @@ -52,7 +52,7 @@ next you must build and deploy ``` cd cors -mvn clean install jboss-as:deploy +mvn clean install wildfly:deploy ``` Step 5: Login and Observe Apps From d67804cd0b8b5d9ed5d79c1108ec0a0919c88b9b Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 4 May 2015 19:33:05 +0200 Subject: [PATCH 2/5] Renamed change logs to CR1 --- ...-changelog-1.2.0.RC1.xml => jpa-changelog-1.2.0.CR1.xml} | 0 .../src/main/resources/META-INF/jpa-changelog-master.xml | 2 +- .../mongo/updater/impl/DefaultMongoUpdaterProvider.java | 4 ++-- .../updates/{Update1_2_0_RC1.java => Update1_2_0_CR1.java} | 4 ++-- .../java/org/keycloak/migration/MigrationModelManager.java | 6 +++--- ...{MigrationTo1_2_0_RC1.java => MigrationTo1_2_0_CR1.java} | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename connections/jpa-liquibase/src/main/resources/META-INF/{jpa-changelog-1.2.0.RC1.xml => jpa-changelog-1.2.0.CR1.xml} (100%) rename connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/{Update1_2_0_RC1.java => Update1_2_0_CR1.java} (97%) rename model/api/src/main/java/org/keycloak/migration/migrators/{MigrationTo1_2_0_RC1.java => MigrationTo1_2_0_CR1.java} (95%) diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.RC1.xml b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml similarity index 100% rename from connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.RC1.xml rename to connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml index 42a702aef2..33eb5a1bcc 100755 --- a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml +++ b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml @@ -4,5 +4,5 @@ - + diff --git a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/DefaultMongoUpdaterProvider.java b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/DefaultMongoUpdaterProvider.java index 10a13683da..551d0e688e 100644 --- a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/DefaultMongoUpdaterProvider.java +++ b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/DefaultMongoUpdaterProvider.java @@ -10,7 +10,7 @@ import org.keycloak.connections.mongo.updater.impl.updates.Update; import org.keycloak.connections.mongo.updater.impl.updates.Update1_0_0_Final; import org.keycloak.connections.mongo.updater.impl.updates.Update1_1_0_Beta1; import org.keycloak.connections.mongo.updater.impl.updates.Update1_2_0_Beta1; -import org.keycloak.connections.mongo.updater.impl.updates.Update1_2_0_RC1; +import org.keycloak.connections.mongo.updater.impl.updates.Update1_2_0_CR1; import org.keycloak.models.KeycloakSession; import java.util.Date; @@ -30,7 +30,7 @@ public class DefaultMongoUpdaterProvider implements MongoUpdaterProvider { Update1_0_0_Final.class, Update1_1_0_Beta1.class, Update1_2_0_Beta1.class, - Update1_2_0_RC1.class + Update1_2_0_CR1.class }; @Override diff --git a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_RC1.java b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_CR1.java similarity index 97% rename from connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_RC1.java rename to connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_CR1.java index 5b98e44a1c..e448644013 100644 --- a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_RC1.java +++ b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_CR1.java @@ -8,11 +8,11 @@ import org.keycloak.models.KeycloakSession; /** * @author Marek Posolda */ -public class Update1_2_0_RC1 extends Update { +public class Update1_2_0_CR1 extends Update { @Override public String getId() { - return "1.2.0.RC1"; + return "1.2.0.CR1"; } @Override diff --git a/model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java b/model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java index c749676367..a0e5959091 100755 --- a/model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java +++ b/model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java @@ -1,7 +1,7 @@ package org.keycloak.migration; import org.jboss.logging.Logger; -import org.keycloak.migration.migrators.MigrationTo1_2_0_RC1; +import org.keycloak.migration.migrators.MigrationTo1_2_0_CR1; import org.keycloak.models.KeycloakSession; /** @@ -19,9 +19,9 @@ public class MigrationModelManager { if (storedVersion == null) stored = new ModelVersion(0, 0, 0); else stored = new ModelVersion(storedVersion); - if (stored.lessThan(MigrationTo1_2_0_RC1.VERSION)) { + if (stored.lessThan(MigrationTo1_2_0_CR1.VERSION)) { logger.info("Migrating older model to 1.2.0.RC1 updates"); - new MigrationTo1_2_0_RC1().migrate(session); + new MigrationTo1_2_0_CR1().migrate(session); } model.setStoredVersion(MigrationModel.LATEST_VERSION); diff --git a/model/api/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_RC1.java b/model/api/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_CR1.java similarity index 95% rename from model/api/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_RC1.java rename to model/api/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_CR1.java index 1ad5ac7de5..bc1c6d8679 100755 --- a/model/api/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_RC1.java +++ b/model/api/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_CR1.java @@ -14,8 +14,8 @@ import java.util.Map; * @author Bill Burke * @version $Revision: 1 $ */ -public class MigrationTo1_2_0_RC1 { - public static final ModelVersion VERSION = new ModelVersion("1.2.0.RC1"); +public class MigrationTo1_2_0_CR1 { + public static final ModelVersion VERSION = new ModelVersion("1.2.0.CR1"); public void setupBrokerService(RealmModel realm) { ClientModel client = realm.getClientNameMap().get(Constants.BROKER_SERVICE_CLIENT_ID); From f5f5d934c81899153defcd5171e49adfc51373f3 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 4 May 2015 19:50:05 +0200 Subject: [PATCH 3/5] Fix saml examples --- examples/saml/post-basic/pom.xml | 89 ++++++++++++++----- examples/saml/post-with-encryption/pom.xml | 78 ++++++++++++---- examples/saml/post-with-signature/pom.xml | 78 ++++++++++++---- examples/saml/redirect-basic/pom.xml | 78 ++++++++++++---- examples/saml/redirect-with-signature/pom.xml | 78 ++++++++++++---- 5 files changed, 316 insertions(+), 85 deletions(-) diff --git a/examples/saml/post-basic/pom.xml b/examples/saml/post-basic/pom.xml index 7cb485b70c..07762a8910 100644 --- a/examples/saml/post-basic/pom.xml +++ b/examples/saml/post-basic/pom.xml @@ -2,17 +2,46 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - keycloak-examples-saml-parent - org.keycloak - 1.2.0.RC1-SNAPSHOT - - - keycloak-example-saml-federation-saml-sp-post-basic + org.picketlink.quickstarts + picketlink-federation-saml-sp-post-basic + 2.7.0.Beta2 war - keycloak-example-saml-federation-saml-sp-post-basic + PicketLink Quickstart: picketlink-federation-saml-sp-post-basic + PicketLink Quickstart: PicketLink Service Provider With a Basic Configuration using SAML HTTP POST Binding + + http://www.picketlink.org + + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + + + + + 7.4.Final + + + 1.0.1.Final + + + 2.7.0.Beta2 + + + jboss-eap + + + 2.1.1 + + + 3.1 + 1.6 + 1.6 + @@ -20,33 +49,51 @@ maven-war-plugin + ${version.war.plugin} + false ${target.container} - - - ${basedir}/conf/${target.container} - - + + + ${basedir}/conf/${target.container} + + + org.jboss.as.plugins jboss-as-maven-plugin + ${version.jboss.maven.plugin} - false - - - - org.wildfly.plugins - wildfly-maven-plugin - - false + ${project.build.finalName}-${target.container}.${project.packaging} + + + wildfly + + wildfly + + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.wildfly.maven.plugin} + + ${project.build.finalName}-${target.container}.${project.packaging} + + + + + + + \ No newline at end of file diff --git a/examples/saml/post-with-encryption/pom.xml b/examples/saml/post-with-encryption/pom.xml index 50f3108179..497bea45e1 100755 --- a/examples/saml/post-with-encryption/pom.xml +++ b/examples/saml/post-with-encryption/pom.xml @@ -2,17 +2,46 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - keycloak-examples-saml-parent - org.keycloak - 1.2.0.RC1-SNAPSHOT - - - keycloak-example-saml-post-with-encryption + org.picketlink.quickstarts + picketlink-federation-saml-sp-with-encryption + 2.7.0.Beta2 war - keycloak-example-saml-post-with-encryption + PicketLink Quickstart: picketlink-federation-saml-sp-with-encryption + PicketLink Quickstart: PicketLink Service Provider With a Basic Configuration using SAML HTTP POST Binding With Encryption Support + + http://www.picketlink.org + + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + + + + + 7.4.Final + + + 1.0.1.Final + + + 2.7.0.Beta2 + + + jboss-eap + + + 2.1.1 + + + 3.1 + 1.6 + 1.6 + @@ -28,6 +57,7 @@ maven-war-plugin + ${version.war.plugin} false @@ -50,21 +80,37 @@ + org.jboss.as.plugins jboss-as-maven-plugin + ${version.jboss.maven.plugin} - false - - - - org.wildfly.plugins - wildfly-maven-plugin - - false + ${project.build.finalName}-${target.container}.${project.packaging} + + + wildfly + + wildfly + + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.wildfly.maven.plugin} + + ${project.build.finalName}-${target.container}.${project.packaging} + + + + + + + \ No newline at end of file diff --git a/examples/saml/post-with-signature/pom.xml b/examples/saml/post-with-signature/pom.xml index 9ea515df36..2c644a706a 100755 --- a/examples/saml/post-with-signature/pom.xml +++ b/examples/saml/post-with-signature/pom.xml @@ -2,17 +2,46 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - keycloak-examples-saml-parent - org.keycloak - 1.2.0.RC1-SNAPSHOT - - - keycloak-example-saml-post-with-signature + org.picketlink.quickstarts + picketlink-federation-saml-sp-post-with-signature + 2.7.0.Beta2 war - keycloak-example-saml-post-with-signature + PicketLink Quickstart: picketlink-federation-saml-sp-post-with-signature + PicketLink Quickstart: PicketLink Service Provider With a Basic Configuration using SAML HTTP POST Binding With Signature Support + + http://www.picketlink.org + + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + + + + + 7.4.Final + + + 1.0.1.Final + + + 2.7.0.Beta2 + + + jboss-eap + + + 2.1.1 + + + 3.1 + 1.6 + 1.6 + @@ -28,6 +57,7 @@ maven-war-plugin + ${version.war.plugin} false @@ -50,21 +80,37 @@ + org.jboss.as.plugins jboss-as-maven-plugin + ${version.jboss.maven.plugin} - false - - - - org.wildfly.plugins - wildfly-maven-plugin - - false + ${project.build.finalName}-${target.container}.${project.packaging} + + + wildfly + + wildfly + + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.wildfly.maven.plugin} + + ${project.build.finalName}-${target.container}.${project.packaging} + + + + + + + \ No newline at end of file diff --git a/examples/saml/redirect-basic/pom.xml b/examples/saml/redirect-basic/pom.xml index 3ca0bc54c3..98c3a40b62 100644 --- a/examples/saml/redirect-basic/pom.xml +++ b/examples/saml/redirect-basic/pom.xml @@ -2,17 +2,46 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - keycloak-examples-saml-parent - org.keycloak - 1.2.0.RC1-SNAPSHOT - - - keycloak-example-saml-redirect-basic + org.picketlink.quickstarts + picketlink-federation-saml-sp-redirect-basic + 2.7.0.Beta2 war - keycloak-example-saml-redirect-basic + PicketLink Quickstart: picketlink-federation-saml-sp-redirect-basic + PicketLink Quickstart: PicketLink Service Provider With a Basic Configuration using SAML HTTP Redirect Binding + + http://www.picketlink.org + + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + + + + + 7.4.Final + + + 1.0.1.Final + + + 2.7.0.Beta2 + + + jboss-eap + + + 2.1.1 + + + 3.1 + 1.6 + 1.6 + @@ -20,6 +49,7 @@ maven-war-plugin + ${version.war.plugin} false @@ -36,21 +66,37 @@ + org.jboss.as.plugins jboss-as-maven-plugin + ${version.jboss.maven.plugin} - false - - - - org.wildfly.plugins - wildfly-maven-plugin - - false + ${project.build.finalName}-${target.container}.${project.packaging} + + + wildfly + + wildfly + + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.wildfly.maven.plugin} + + ${project.build.finalName}-${target.container}.${project.packaging} + + + + + + + \ No newline at end of file diff --git a/examples/saml/redirect-with-signature/pom.xml b/examples/saml/redirect-with-signature/pom.xml index a94f159cc6..d491d8ec89 100755 --- a/examples/saml/redirect-with-signature/pom.xml +++ b/examples/saml/redirect-with-signature/pom.xml @@ -2,17 +2,46 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - keycloak-examples-saml-parent - org.keycloak - 1.2.0.RC1-SNAPSHOT - - - keycloak-example-saml-redirect-with-signature + org.picketlink.quickstarts + picketlink-federation-saml-sp-redirect-with-signature + 2.7.0.Beta2 war - keycloak-example-saml-redirect-with-signature + PicketLink Quickstart: picketlink-federation-saml-sp-redirect-with-signature + PicketLink Quickstart: PicketLink Service Provider With a Basic Configuration using SAML HTTP Redirect Binding With Signature Support + + http://www.picketlink.org + + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + + + + + 7.4.Final + + + 1.0.1.Final + + + 2.7.0.Beta2 + + + jboss-eap + + + 2.1.1 + + + 3.1 + 1.6 + 1.6 + @@ -28,6 +57,7 @@ maven-war-plugin + ${version.war.plugin} false @@ -50,21 +80,37 @@ + org.jboss.as.plugins jboss-as-maven-plugin + ${version.jboss.maven.plugin} - false - - - - org.wildfly.plugins - wildfly-maven-plugin - - false + ${project.build.finalName}-${target.container}.${project.packaging} + + + wildfly + + wildfly + + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.wildfly.maven.plugin} + + ${project.build.finalName}-${target.container}.${project.packaging} + + + + + + + \ No newline at end of file From 523f74674515cf88a2663226df971054ae40eef8 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 4 May 2015 20:13:08 +0200 Subject: [PATCH 4/5] Added providers classpath for standalone/configuration/providers --- .../src/main/resources/META-INF/keycloak-server.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/distribution/subsystem-war/src/main/resources/META-INF/keycloak-server.json b/distribution/subsystem-war/src/main/resources/META-INF/keycloak-server.json index 3e1896c90b..9b8f05171d 100755 --- a/distribution/subsystem-war/src/main/resources/META-INF/keycloak-server.json +++ b/distribution/subsystem-war/src/main/resources/META-INF/keycloak-server.json @@ -1,4 +1,8 @@ { + "providers": [ + "classpath:${jboss.server.config.dir}/providers/*" + ], + "admin": { "realm": "master" }, From 937ab313e5246f9df81d04bf34de9438a14a153f Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 4 May 2015 20:29:30 +0200 Subject: [PATCH 5/5] Added distribution changes to migration docs --- .../en/en-US/modules/MigrationFromOlderVersions.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml index c35f746496..ada2a89900 100755 --- a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml +++ b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml @@ -81,6 +81,16 @@ Version specific migration
Migrating from 1.2.0.Beta1 to 1.2.0.RC1 + + Distribution changes + + Keycloak is now available in 3 downloads: standalone, overlay and demo bundle. The standalone is intended + for production and non-JEE developers. Overlay is aimed at adding Keycloak to an existing WildFly 8.2 or EAP 6.4 + installation and is mainly for development. Finally we have a demo (or dev) bundle that is aimed at + developers getting started with Keycloak. This bundle contains a WildFly server, with Keycloak server and + adapter included. It also contains all documentation and examples. + + Database changed