diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml index 694fd45a56..a6dafdbbea 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml @@ -56,7 +56,6 @@ org.bouncycastle bcprov-jdk15on - ${bouncycastle.crypto.version} org.bouncycastle diff --git a/distribution/demo-dist/pom.xml b/distribution/demo-dist/pom.xml index e5394f1f84..7f1e17a2cf 100755 --- a/distribution/demo-dist/pom.xml +++ b/distribution/demo-dist/pom.xml @@ -16,7 +16,7 @@ org.keycloak - keycloak-server-overlay + keycloak-wf9-server-overlay zip @@ -77,7 +77,7 @@ org.keycloak - keycloak-server-overlay + keycloak-wf9-server-overlay zip ${project.build.directory}/unpacked/keycloak-server-overlay-${project.version} diff --git a/distribution/feature-packs/server-feature-pack/pom.xml b/distribution/feature-packs/server-feature-pack/pom.xml index 9925f5f337..2ea0d5ec86 100644 --- a/distribution/feature-packs/server-feature-pack/pom.xml +++ b/distribution/feature-packs/server-feature-pack/pom.xml @@ -34,20 +34,17 @@ org.keycloak keycloak-dependencies-server-all - ${project.version} pom org.keycloak.subsystem keycloak-server - ${project.version} war org.keycloak - keycloak-wildfly-server-subsystem - ${project.version} - + keycloak-wf9-server-subsystem + org.wildfly wildfly-feature-pack @@ -57,7 +54,6 @@ org.keycloak.subsystem keycloak-server war - ${project.version} @@ -123,7 +119,6 @@ org.keycloak.subsystem keycloak-server - ${project.version} war true ${project.build.directory}/${project.build.finalName}/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/module.xml index 0d0c336440..646c6d6b40 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/module.xml @@ -30,23 +30,9 @@ - - - - - - - - - - - - - - - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wf9-server-subsystem/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wf9-server-subsystem/main/module.xml new file mode 100644 index 0000000000..61d3858ed7 --- /dev/null +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wf9-server-subsystem/main/module.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/pom.xml b/distribution/pom.xml index 68f19b540e..d51a4e55e7 100755 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -31,7 +31,6 @@ demo-dist docs-dist examples-dist - modules proxy-dist server-dist server-overlay diff --git a/distribution/modules/assembly.xml b/distribution/server-overlay/eap6/eap6-server-modules/assembly.xml similarity index 96% rename from distribution/modules/assembly.xml rename to distribution/server-overlay/eap6/eap6-server-modules/assembly.xml index 098b1d8636..4a34435ac4 100755 --- a/distribution/modules/assembly.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/assembly.xml @@ -1,22 +1,22 @@ - - dist - - - zip - - false - - - - ../../ - - License.html - - - - - ${project.build.directory}/modules - - - - + + dist + + + zip + + false + + + + ../../ + + License.html + + + + + ${project.build.directory}/modules + + + + diff --git a/distribution/modules/build.xml b/distribution/server-overlay/eap6/eap6-server-modules/build.xml similarity index 97% rename from distribution/modules/build.xml rename to distribution/server-overlay/eap6/eap6-server-modules/build.xml index fb8971d524..bf6a829b42 100755 --- a/distribution/modules/build.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/build.xml @@ -46,6 +46,11 @@ + + + + + @@ -306,9 +311,12 @@ - - + + + + + diff --git a/distribution/modules/lib.xml b/distribution/server-overlay/eap6/eap6-server-modules/lib.xml similarity index 100% rename from distribution/modules/lib.xml rename to distribution/server-overlay/eap6/eap6-server-modules/lib.xml diff --git a/distribution/modules/pom.xml b/distribution/server-overlay/eap6/eap6-server-modules/pom.xml similarity index 90% rename from distribution/modules/pom.xml rename to distribution/server-overlay/eap6/eap6-server-modules/pom.xml index c4fffdbda4..a12940a1e2 100755 --- a/distribution/modules/pom.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/pom.xml @@ -1,155 +1,158 @@ - - - - 4.0.0 - - - keycloak-parent - org.keycloak - 1.3.0.Final-SNAPSHOT - ../../pom.xml - - - keycloak-jboss-modules - - Keycloak JBoss Modules - pom - - - org.keycloak - keycloak-dependencies-server-all - pom - - - org.keycloak - keycloak-wildfly-extensions - - - org.keycloak - keycloak-core - - - org.keycloak - keycloak-core-jaxrs - - - org.keycloak - keycloak-wildfly-server-subsystem - ${project.version} - - - org.keycloak.subsystem - keycloak-server - war - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - false - - - build-dist - - run - - compile - - - - - - - - - - - - org.jboss - jandex - 1.0.3.Final - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - org.apache.ant - ant-apache-bsf - 1.9.3 - - - org.apache.bsf - bsf-api - 3.1 - - - rhino - js - 1.7R2 - - - - - maven-assembly-plugin - - - assemble - package - - single - - - - assembly.xml - - - target - - - target/assembly/work - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - compile - - copy - - - - - org.keycloak.subsystem - keycloak-server - war - true - ${project.build.directory}/modules/org/keycloak/keycloak-server-subsystem/main/auth-server - - - - - - - - - + + + + 4.0.0 + + + keycloak-parent + org.keycloak + 1.3.0.Final-SNAPSHOT + ../../../../pom.xml + + + keycloak-eap6-server-modules + + Keycloak EAP 6 Server Modules + pom + + + org.keycloak + keycloak-dependencies-server-all + pom + + + org.keycloak + keycloak-core + + + org.keycloak + keycloak-core-jaxrs + + + org.keycloak + keycloak-as7-server-subsystem + + + org.keycloak.subsystem + keycloak-server + war + + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + false + + + build-dist + + run + + compile + + + + + + + + + + + + org.jboss + jandex + 1.0.3.Final + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + org.apache.ant + ant-apache-bsf + 1.9.3 + + + org.apache.bsf + bsf-api + 3.1 + + + rhino + js + 1.7R2 + + + + + maven-assembly-plugin + + + assemble + package + + single + + + + assembly.xml + + + target + + + target/assembly/work + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + compile + + copy + + + + + org.keycloak.subsystem + keycloak-server + war + true + ${project.build.directory}/modules/org/keycloak/keycloak-as7-server-subsystem/main/server-war + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/com/google/zxing/core/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/com/google/zxing/core/main/module.xml similarity index 95% rename from distribution/modules/src/main/resources/modules/com/google/zxing/core/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/com/google/zxing/core/main/module.xml index 78a8c49302..cafd9a758c 100755 --- a/distribution/modules/src/main/resources/modules/com/google/zxing/core/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/com/google/zxing/core/main/module.xml @@ -1,13 +1,13 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/com/google/zxing/javase/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/com/google/zxing/javase/main/module.xml similarity index 95% rename from distribution/modules/src/main/resources/modules/com/google/zxing/javase/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/com/google/zxing/javase/main/module.xml index a08a5f9005..7d72a872da 100755 --- a/distribution/modules/src/main/resources/modules/com/google/zxing/javase/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/com/google/zxing/javase/main/module.xml @@ -1,14 +1,14 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/de/idyl/winzipaes/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/de/idyl/winzipaes/main/module.xml similarity index 95% rename from distribution/modules/src/main/resources/modules/de/idyl/winzipaes/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/de/idyl/winzipaes/main/module.xml index 7d13910ed5..10f1103cfd 100755 --- a/distribution/modules/src/main/resources/modules/de/idyl/winzipaes/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/de/idyl/winzipaes/main/module.xml @@ -1,13 +1,13 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/javax/ws/rs/api/2.0/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/javax/ws/rs/api/2.0/module.xml new file mode 100644 index 0000000000..e972564181 --- /dev/null +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/javax/ws/rs/api/2.0/module.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/distribution/modules/src/main/resources/modules/net/iharder/base64/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/net/iharder/base64/main/module.xml similarity index 95% rename from distribution/modules/src/main/resources/modules/net/iharder/base64/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/net/iharder/base64/main/module.xml index 352ee9c498..c99b96879b 100755 --- a/distribution/modules/src/main/resources/modules/net/iharder/base64/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/net/iharder/base64/main/module.xml @@ -1,13 +1,13 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/bouncycastle/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/bouncycastle/main/module.xml new file mode 100644 index 0000000000..d8fcf474cb --- /dev/null +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/bouncycastle/main/module.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/distribution/modules/src/main/resources/modules/org/freemarker/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/freemarker/main/module.xml similarity index 95% rename from distribution/modules/src/main/resources/modules/org/freemarker/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/freemarker/main/module.xml index 90b6464676..d2749543ba 100755 --- a/distribution/modules/src/main/resources/modules/org/freemarker/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/freemarker/main/module.xml @@ -1,14 +1,14 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml index 8432c99484..1eba478b07 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml index 1790a854d8..34840a6339 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-server-subsystem/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/module.xml similarity index 98% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-server-subsystem/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/module.xml index 21f917ead8..4715783e73 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-server-subsystem/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/module.xml @@ -22,7 +22,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml index 33525e95e5..825ba3124d 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml index 5457d86e62..651547dbff 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml index ac30917c48..0f2a22bfd8 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-file/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-file/main/module.xml similarity index 100% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-file/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-file/main/module.xml diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-http-client/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-http-client/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-http-client/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-http-client/main/module.xml index 7739aa320a..630a09e62b 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-http-client/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-http-client/main/module.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml index d6b86d5c1b..d63e4df848 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml index c5b7d85166..041108c57a 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml index 070b3b0d70..c2b14a3ff2 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml similarity index 100% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml index 5f4aa72140..3decf9a8f4 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml index 6c99976670..e8b0e5c04f 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml index 5a35b132aa..545f16847c 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml @@ -1,21 +1,21 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml index 5a9c4f98f2..238d86db27 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml index 23003490cc..d9e9141efe 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml index af1ceeb9ff..5e3279d73c 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml @@ -1,16 +1,16 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml index 209116515d..fd67f343d1 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml index 00943abc7b..c2408274d5 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml index f902c4e1a1..78608224ce 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml index 3e20796874..4e72c8c306 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml index b36c5cb7cf..7ff6b07105 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml index db4ee600b4..046e436616 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml index 12dfd46f25..9940d3e2cb 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml index 1351976b3b..2e28fbb689 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml index b3798a3a1f..aebe235ed5 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml index e9359dc22f..33bb178472 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml index 45729feee2..a80921e577 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml index 5e222dbdd7..b482069d1f 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-js-adapter/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-js-adapter/main/module.xml similarity index 95% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-js-adapter/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-js-adapter/main/module.xml index 5a2fdf085e..88516811eb 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-js-adapter/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-js-adapter/main/module.xml @@ -1,12 +1,12 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-kerberos-federation/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-kerberos-federation/main/module.xml similarity index 100% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-kerberos-federation/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-kerberos-federation/main/module.xml diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml index 5f88f37e82..3ef2bd3b74 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml index 8fcd75c8f0..372d708879 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml index e7b2d3526b..7c3247b42f 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml index 30ce7636da..c5902a890d 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-file/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-file/main/module.xml similarity index 100% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-file/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-file/main/module.xml diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml index 5603e027aa..88cdce905e 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml index 2017d49455..205a30b2ab 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml index b17720e3fc..f2c564b805 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-jpa/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-jpa/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-jpa/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-jpa/main/module.xml index b26bce7757..f09407df79 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-jpa/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-jpa/main/module.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mem/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mem/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mem/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mem/main/module.xml index 6e6b3472d1..20ab6d0c95 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mem/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mem/main/module.xml @@ -1,16 +1,16 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mongo/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mongo/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mongo/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mongo/main/module.xml index 8e562076af..f1408f3d1c 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mongo/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mongo/main/module.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml index 67d251429c..1e59fd173e 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml index 45512ac392..b287cbc67c 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-server-subsystem/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-server-subsystem/main/module.xml new file mode 100755 index 0000000000..4326de4650 --- /dev/null +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-server-subsystem/main/module.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-server/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-server/main/module.xml similarity index 98% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-server/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-server/main/module.xml index fd8e190fb3..1546f8ed9b 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-server/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-server/main/module.xml @@ -1,61 +1,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml similarity index 98% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml index 0ee8056eaf..0ff106f989 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml @@ -1,82 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml index 76b344d25d..31c7e95f14 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml index a3db93e3c7..f842f83cdc 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml index ad2223940e..86f47742ff 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml index e1ba05b13a..d2cd5d6429 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-linkedin/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-linkedin/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-linkedin/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-linkedin/main/module.xml index 00853bf3a3..34e847ec33 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-linkedin/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-linkedin/main/module.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-stackoverflow/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-stackoverflow/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-stackoverflow/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-stackoverflow/main/module.xml index 6ddd2a4b93..5d8c98d6e0 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-stackoverflow/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-stackoverflow/main/module.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml similarity index 97% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml index 7d5022dac4..a7ca1d435f 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml index 0140db4a67..474fa0184c 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml @@ -1,16 +1,16 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml similarity index 96% rename from distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml index 6147e17e02..dbb65bc223 100755 --- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/liquibase/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/liquibase/main/module.xml similarity index 95% rename from distribution/modules/src/main/resources/modules/org/liquibase/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/liquibase/main/module.xml index 23826c4b39..ed75cbc796 100755 --- a/distribution/modules/src/main/resources/modules/org/liquibase/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/liquibase/main/module.xml @@ -1,14 +1,14 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml similarity index 95% rename from distribution/modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml index d07ac5d9eb..82c6a135b0 100755 --- a/distribution/modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml @@ -1,13 +1,13 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/org/twitter4j/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/twitter4j/main/module.xml similarity index 95% rename from distribution/modules/src/main/resources/modules/org/twitter4j/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/twitter4j/main/module.xml index 887a044a24..6c6187f98c 100755 --- a/distribution/modules/src/main/resources/modules/org/twitter4j/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/twitter4j/main/module.xml @@ -1,13 +1,13 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/distribution/modules/src/main/resources/modules/sun/jdk/jgss/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/sun/jdk/jgss/main/module.xml similarity index 100% rename from distribution/modules/src/main/resources/modules/sun/jdk/jgss/main/module.xml rename to distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/sun/jdk/jgss/main/module.xml diff --git a/distribution/server-overlay/eap6/eap6-server-overlay/assembly.xml b/distribution/server-overlay/eap6/eap6-server-overlay/assembly.xml new file mode 100755 index 0000000000..1ead8b9e8e --- /dev/null +++ b/distribution/server-overlay/eap6/eap6-server-overlay/assembly.xml @@ -0,0 +1,45 @@ + + server-dist + + + zip + tar.gz + + + false + + + + ${project.build.directory}/unpacked/modules + modules/system/layers/base + + + ../../../forms/common-themes/src/main/resources/theme + standalone/configuration/themes + + **/** + + + + + + + ${project.build.directory}/standalone.xml + standalone/configuration + standalone-keycloak.xml + + + src/main/keycloak-server.json + standalone/configuration + + + src/main/themes/README.txt + standalone/configuration/themes + + + src/main/providers/README.txt + standalone/configuration/providers + + + + diff --git a/distribution/server-overlay/eap6/eap6-server-overlay/pom.xml b/distribution/server-overlay/eap6/eap6-server-overlay/pom.xml new file mode 100755 index 0000000000..b767ff8672 --- /dev/null +++ b/distribution/server-overlay/eap6/eap6-server-overlay/pom.xml @@ -0,0 +1,128 @@ + + 4.0.0 + + keycloak-parent + org.keycloak + 1.3.0.Final-SNAPSHOT + ../../../../pom.xml + + + keycloak-eap6-server-overlay + pom + Keycloak EAP 6 Server Overlay Distribution + + + + + org.keycloak + keycloak-eap6-server-modules + zip + + + org.jboss.as + jboss-as-dist + zip + ${jboss.version} + + + + + keycloak-eap6-overlay-${project.version} + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-standalone-xml + prepare-package + + unpack + + + + + org.jboss.as + jboss-as-dist + zip + ${project.build.directory}/unpacked + + + */standalone/configuration/standalone.xml + + + + unpack-jboss-modules + prepare-package + + unpack + + + + + org.keycloak + keycloak-eap6-server-modules + zip + ${project.build.directory}/unpacked/modules + + + + + + + + org.codehaus.mojo + xml-maven-plugin + 1.0 + + + generate-resources + package + + transform + + + + + ${project.build.directory}/unpacked/jboss-eap-6.4/standalone/configuration + src/main/xslt/standalone.xsl + + standalone.xml + + ${project.build.directory} + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + package + + single + + + + assembly.xml + + true + ${project.build.finalName} + false + ${project.build.directory} + ${project.build.directory}/assembly/work + gnu + + + + + + + + diff --git a/distribution/server-overlay/eap6/eap6-server-overlay/src/main/keycloak-server.json b/distribution/server-overlay/eap6/eap6-server-overlay/src/main/keycloak-server.json new file mode 100644 index 0000000000..9f0d03ea5d --- /dev/null +++ b/distribution/server-overlay/eap6/eap6-server-overlay/src/main/keycloak-server.json @@ -0,0 +1,72 @@ +{ + "admin": { + "realm": "master" + }, + + "eventsStore": { + "provider": "jpa", + "jpa": { + "exclude-events": [ "REFRESH_TOKEN" ] + } + }, + + "realm": { + "provider": "jpa" + }, + + "user": { + "provider": "jpa" + }, + + "userSessions": { + "provider" : "mem" + }, + + "realmCache": { + "provider": "mem" + }, + + "userCache": { + "provider": "mem", + "mem": { + "maxSize": 20000 + } + }, + + "timer": { + "provider": "basic" + }, + + "theme": { + "default": "keycloak", + "staticMaxAge": 2592000, + "cacheTemplates": true, + "cacheThemes": true, + "folder": { + "dir": "${jboss.server.config.dir}/themes" + } + }, + + "login": { + "provider": "freemarker" + }, + + "account": { + "provider": "freemarker" + }, + + "email": { + "provider": "freemarker" + }, + + "scheduled": { + "interval": 900 + }, + + "connectionsJpa": { + "default": { + "dataSource": "java:jboss/datasources/KeycloakDS", + "databaseSchema": "update" + } + } +} \ No newline at end of file diff --git a/distribution/server-overlay/eap6/eap6-server-overlay/src/main/providers/README.txt b/distribution/server-overlay/eap6/eap6-server-overlay/src/main/providers/README.txt new file mode 100644 index 0000000000..a6d523b43f --- /dev/null +++ b/distribution/server-overlay/eap6/eap6-server-overlay/src/main/providers/README.txt @@ -0,0 +1,2 @@ +Any provider implementation jars and libraries in this folder will be loaded by Keycloak. See the providers +section in the documentation for more details. \ No newline at end of file diff --git a/distribution/server-overlay/eap6/eap6-server-overlay/src/main/themes/README.txt b/distribution/server-overlay/eap6/eap6-server-overlay/src/main/themes/README.txt new file mode 100644 index 0000000000..705b73ac69 --- /dev/null +++ b/distribution/server-overlay/eap6/eap6-server-overlay/src/main/themes/README.txt @@ -0,0 +1,3 @@ +Themes to configure the look and feel of login pages and account management console. It's not recommended to +modify existing the built-in themes, instead you should create a new theme that extends a built-in theme. See the theme +section in the documentation for more details. \ No newline at end of file diff --git a/distribution/server-overlay/eap6/eap6-server-overlay/src/main/xslt/standalone.xsl b/distribution/server-overlay/eap6/eap6-server-overlay/src/main/xslt/standalone.xsl new file mode 100755 index 0000000000..6f0abad4d9 --- /dev/null +++ b/distribution/server-overlay/eap6/eap6-server-overlay/src/main/xslt/standalone.xsl @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE + h2 + + sa + sa + + + + + + + + + + + auth + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/distribution/server-overlay/eap6/pom.xml b/distribution/server-overlay/eap6/pom.xml new file mode 100755 index 0000000000..4ba114b7bc --- /dev/null +++ b/distribution/server-overlay/eap6/pom.xml @@ -0,0 +1,21 @@ + + 4.0.0 + + keycloak-parent + org.keycloak + 1.3.0.Final-SNAPSHOT + ../../../pom.xml + + + keycloak-eap6-server-overlay-parent + pom + Keycloak EAP 6 Server Overlay + + + + + eap6-server-modules + eap6-server-overlay + + diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml index 7ab8862188..1ad265932c 100755 --- a/distribution/server-overlay/pom.xml +++ b/distribution/server-overlay/pom.xml @@ -1,78 +1,21 @@ - - 4.0.0 - - keycloak-parent - org.keycloak - 1.3.0.Final-SNAPSHOT - ../../pom.xml - - - keycloak-server-overlay - pom - Keycloak Server Overlay Distribution - - - - - org.keycloak - keycloak-server-dist - zip - - - - - keycloak-overlay-${project.version} - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-server-dist - prepare-package - - unpack - - - - - org.keycloak - keycloak-server-dist - zip - ${project.build.directory}/unpacked - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - assemble - package - - single - - - - assembly.xml - - true - ${project.build.finalName} - false - ${project.build.directory} - ${project.build.directory}/assembly/work - gnu - - - - - - - - + + 4.0.0 + + keycloak-parent + org.keycloak + 1.3.0.Final-SNAPSHOT + ../../pom.xml + + + keycloak-server-overlay + pom + Keycloak Server Overlay Distributions + + + + + wf9-server-overlay + eap6 + + diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/wf9-server-overlay/assembly.xml similarity index 97% rename from distribution/server-overlay/assembly.xml rename to distribution/server-overlay/wf9-server-overlay/assembly.xml index 6efb409247..4d87e6912e 100755 --- a/distribution/server-overlay/assembly.xml +++ b/distribution/server-overlay/wf9-server-overlay/assembly.xml @@ -1,67 +1,67 @@ - - server-dist - - - zip - tar.gz - - - false - - - - ${project.build.directory}/unpacked/keycloak-${project.version}/modules/system/layers/base - modules/system/layers/base - - com/google/zxing/** - de/idyl/winzipaes/** - net/iharder/** - org/freemarker/** - org/keycloak/** - org/liquibase/** - org/mongodb/** - org/twitter4j/** - sun/jdk/jgss/** - - - - ${project.build.directory}/unpacked/keycloak-${project.version}/content - - - - ${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/themes - standalone/configuration/themes - - **/** - - - - ${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/providers - standalone/configuration/providers - - **/** - - - - ../../ - - License.html - - - - - - - - - ${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/standalone.xml - standalone/configuration - standalone-keycloak.xml - - - ${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/keycloak-server.json - standalone/configuration - - - - + + server-dist + + + zip + tar.gz + + + false + + + + ${project.build.directory}/unpacked/keycloak-${project.version}/modules/system/layers/base + modules/system/layers/base + + com/google/zxing/** + de/idyl/winzipaes/** + net/iharder/** + org/freemarker/** + org/keycloak/** + org/liquibase/** + org/mongodb/** + org/twitter4j/** + sun/jdk/jgss/** + + + + ${project.build.directory}/unpacked/keycloak-${project.version}/content + + + + ${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/themes + standalone/configuration/themes + + **/** + + + + ${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/providers + standalone/configuration/providers + + **/** + + + + ../../ + + License.html + + + + + + + + + ${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/standalone.xml + standalone/configuration + standalone-keycloak.xml + + + ${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/keycloak-server.json + standalone/configuration + + + + diff --git a/distribution/server-overlay/wf9-server-overlay/pom.xml b/distribution/server-overlay/wf9-server-overlay/pom.xml new file mode 100755 index 0000000000..497c4ebc8f --- /dev/null +++ b/distribution/server-overlay/wf9-server-overlay/pom.xml @@ -0,0 +1,78 @@ + + 4.0.0 + + keycloak-parent + org.keycloak + 1.3.0.Final-SNAPSHOT + ../../../pom.xml + + + keycloak-wf9-server-overlay + pom + Keycloak Wildfly 9 Server Overlay Distribution + + + + + org.keycloak + keycloak-server-dist + zip + + + + + keycloak-overlay-${project.version} + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-server-dist + prepare-package + + unpack + + + + + org.keycloak + keycloak-server-dist + zip + ${project.build.directory}/unpacked + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + package + + single + + + + assembly.xml + + true + ${project.build.finalName} + false + ${project.build.directory} + ${project.build.directory}/assembly/work + gnu + + + + + + + + diff --git a/integration/as7-eap6/as7-server-subsystem/pom.xml b/integration/as7-eap6/as7-server-subsystem/pom.xml new file mode 100755 index 0000000000..d268d352cb --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/pom.xml @@ -0,0 +1,104 @@ + + + + 4.0.0 + + + org.keycloak + keycloak-parent + 1.3.0.Final-SNAPSHOT + ../../../pom.xml + + + keycloak-as7-server-subsystem + Keycloak AS7 / EAP 6 Server Subsystem + + jar + + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + true + + + jboss.home + ${jboss.home} + + + + **/*TestCase.java + + + + + + + + + org.jboss.as + jboss-as-naming + ${jboss.version} + + + org.jboss.as + jboss-as-server + ${jboss.version} + + + org.jboss.as + jboss-as-ee + ${jboss.version} + + + org.jboss.as + jboss-as-web + ${jboss.version} + + + org.jboss.logging + jboss-logging-annotations + ${jboss-logging-tools.version} + + provided + true + + + + org.jboss.logging + jboss-logging-processor + + provided + true + + + org.jboss.msc + jboss-msc + 1.0.2.GA + + + junit + junit + test + + + diff --git a/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakAdapterConfigService.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakAdapterConfigService.java new file mode 100755 index 0000000000..9e13799f16 --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakAdapterConfigService.java @@ -0,0 +1,48 @@ +/* + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.as7; + +/** + * This service keeps track of the entire Keycloak management model so as to provide + * adapter configuration to each deployment at deploy time. + * + * @author Stan Silvert ssilvert@redhat.com (C) 2013 Red Hat Inc. + */ +public final class KeycloakAdapterConfigService { + + static final KeycloakAdapterConfigService INSTANCE = new KeycloakAdapterConfigService(); + + static final String DEPLOYMENT_NAME = "keycloak-server"; + + private String webContext; + + + private KeycloakAdapterConfigService() { + } + + void setWebContext(String webContext) { + this.webContext = webContext; + } + + String getWebContext() { + return webContext; + } + + boolean isKeycloakServerDeployment(String deploymentName) { + return DEPLOYMENT_NAME.equals(deploymentName); + } +} diff --git a/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakExtension.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakExtension.java new file mode 100755 index 0000000000..296faa5671 --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakExtension.java @@ -0,0 +1,75 @@ +/* + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.as7; + +import org.jboss.as.controller.Extension; +import org.jboss.as.controller.ExtensionContext; +import org.jboss.as.controller.PathElement; +import org.jboss.as.controller.ResourceDefinition; +import org.jboss.as.controller.SubsystemRegistration; +import org.jboss.as.controller.descriptions.StandardResourceDescriptionResolver; +import org.jboss.as.controller.parsing.ExtensionParsingContext; + +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; +import static org.keycloak.subsystem.server.logging.KeycloakLogger.ROOT_LOGGER; + + +/** + * Main Extension class for the subsystem. + * + * @author Stan Silvert ssilvert@redhat.com (C) 2013 Red Hat Inc. + */ +public class KeycloakExtension implements Extension { + + static final String SUBSYSTEM_NAME = "keycloak-server"; + static final String NAMESPACE = "urn:jboss:domain:keycloak-server:1.1"; + static final PathElement PATH_SUBSYSTEM = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME); + + private static final String RESOURCE_NAME = KeycloakExtension.class.getPackage().getName() + ".LocalDescriptions"; + private static final ResourceDefinition KEYCLOAK_SUBSYSTEM_RESOURCE = new KeycloakSubsystemDefinition(); + private static final KeycloakSubsystemParser PARSER = new KeycloakSubsystemParser(); + private static final int MGMT_API_VERSION_MAJOR = 1; + private static final int MGMT_API_VERSION_MINOR = 1; + + static StandardResourceDescriptionResolver getResourceDescriptionResolver(final String... keyPrefix) { + StringBuilder prefix = new StringBuilder(SUBSYSTEM_NAME); + for (String kp : keyPrefix) { + prefix.append('.').append(kp); + } + return new StandardResourceDescriptionResolver(prefix.toString(), RESOURCE_NAME, KeycloakExtension.class.getClassLoader(), true, false); + } + + /** + * {@inheritDoc} + */ + @Override + public void initializeParsers(final ExtensionParsingContext context) { + context.setSubsystemXmlMapping(SUBSYSTEM_NAME, NAMESPACE, PARSER); + } + + /** + * {@inheritDoc} + */ + @Override + public void initialize(final ExtensionContext context) { + ROOT_LOGGER.debug("Activating Keycloak Extension"); + final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MGMT_API_VERSION_MAJOR, MGMT_API_VERSION_MINOR); + + subsystem.registerSubsystemModel(KEYCLOAK_SUBSYSTEM_RESOURCE); + subsystem.registerXMLElementWriter(PARSER); + } +} diff --git a/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakServerDeploymentProcessor.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakServerDeploymentProcessor.java new file mode 100644 index 0000000000..145071d280 --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakServerDeploymentProcessor.java @@ -0,0 +1,53 @@ +/* + * Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.as7; + +import org.jboss.as.ee.component.EEModuleDescription; +import org.jboss.as.server.deployment.DeploymentPhaseContext; +import org.jboss.as.server.deployment.DeploymentUnit; +import org.jboss.as.server.deployment.DeploymentUnitProcessingException; +import org.jboss.as.server.deployment.DeploymentUnitProcessor; + +/** + * DUP responsible for setting the web context of a Keycloak auth server. + * + * @author Stan Silvert ssilvert@redhat.com (C) 2014 Red Hat Inc. + */ +public class KeycloakServerDeploymentProcessor implements DeploymentUnitProcessor { + + @Override + public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { + DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); + KeycloakAdapterConfigService config = KeycloakAdapterConfigService.INSTANCE; + String deploymentName = deploymentUnit.getName(); + + if (!config.isKeycloakServerDeployment(deploymentName)) { + return; + } + + final EEModuleDescription description = deploymentUnit.getAttachment(org.jboss.as.ee.component.Attachments.EE_MODULE_DESCRIPTION); + String webContext = config.getWebContext(); + if (webContext == null) { + throw new DeploymentUnitProcessingException("Can't determine web context/module for Keycloak Server"); + } + description.setModuleName(webContext); + } + + @Override + public void undeploy(DeploymentUnit du) { + } +} diff --git a/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemAdd.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemAdd.java new file mode 100755 index 0000000000..19d7aa2a6b --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemAdd.java @@ -0,0 +1,86 @@ +/* + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.as7; + +import org.jboss.as.controller.AbstractBoottimeAddStepHandler; +import org.jboss.as.controller.AttributeDefinition; +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.as.controller.ServiceVerificationHandler; +import org.jboss.as.controller.registry.Resource; +import org.jboss.as.server.AbstractDeploymentChainStep; +import org.jboss.as.server.DeploymentProcessorTarget; +import org.jboss.as.server.deployment.Phase; +import org.jboss.dmr.ModelNode; + +import org.jboss.msc.service.ServiceController; + +import java.util.List; + +import static org.keycloak.subsystem.server.as7.KeycloakExtension.SUBSYSTEM_NAME; + +/** + * The Keycloak subsystem add update handler. + * + * @author Stan Silvert ssilvert@redhat.com (C) 2013 Red Hat Inc. + */ +class KeycloakSubsystemAdd extends AbstractBoottimeAddStepHandler { + + static final KeycloakSubsystemAdd INSTANCE = new KeycloakSubsystemAdd(); + + @Override + protected void performBoottime(final OperationContext context, final ModelNode operation, final ModelNode model, ServiceVerificationHandler verificationHandler, List> newControllers) { + context.addStep(new AbstractDeploymentChainStep() { + @Override + protected void execute(DeploymentProcessorTarget processorTarget) { + processorTarget.addDeploymentProcessor(SUBSYSTEM_NAME, + Phase.POST_MODULE, // PHASE + Phase.POST_MODULE_VALIDATOR_FACTORY - 1, // PRIORITY + new KeycloakServerDeploymentProcessor()); + } + }, OperationContext.Stage.RUNTIME); + } + + protected void populateModel(final OperationContext context, final ModelNode operation, final Resource resource) throws OperationFailedException { + ModelNode model = resource.getModel(); + + // set attribute values from parsed model + for (AttributeDefinition attrDef : KeycloakSubsystemDefinition.ALL_ATTRIBUTES) { + attrDef.validateAndSet(operation, model); + } + + // returns early if on domain controller + if (!requiresRuntime(context)) { + return; + } + + // don't want to try to start server on host controller + if (!context.isNormalServer()) { + return; + } + + ModelNode webContextNode = resource.getModel().get(KeycloakSubsystemDefinition.WEB_CONTEXT.getName()); + if (!webContextNode.isDefined()) { + webContextNode = KeycloakSubsystemDefinition.WEB_CONTEXT.getDefaultValue(); + } + String webContext = webContextNode.asString(); + + ServerUtil serverUtil = new ServerUtil(operation); + serverUtil.addStepToUploadServerWar(context); + KeycloakAdapterConfigService.INSTANCE.setWebContext(webContext); + } +} diff --git a/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemDefinition.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemDefinition.java new file mode 100644 index 0000000000..832aa92b59 --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemDefinition.java @@ -0,0 +1,87 @@ +/* + * Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.as7; + +import org.jboss.as.controller.AttributeDefinition; +import org.jboss.as.controller.SimpleAttributeDefinition; +import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; +import org.jboss.as.controller.SimpleResourceDefinition; +import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler; +import org.jboss.as.controller.registry.ManagementResourceRegistration; +import org.jboss.dmr.ModelNode; +import org.jboss.dmr.ModelType; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Definition of subsystem=keycloak-server. + * + * @author Stan Silvert ssilvert@redhat.com (C) 2013 Red Hat Inc. + */ +public class KeycloakSubsystemDefinition extends SimpleResourceDefinition { + + static final SimpleAttributeDefinition WEB_CONTEXT = + new SimpleAttributeDefinitionBuilder("web-context", ModelType.STRING, true) + .setAllowExpression(true) + .setDefaultValue(new ModelNode("auth")) + .setRestartAllServices() + .build(); + + static final List ALL_ATTRIBUTES = new ArrayList(); + + static { + ALL_ATTRIBUTES.add(WEB_CONTEXT); + } + + private static final Map DEFINITION_LOOKUP = new HashMap(); + static { + for (SimpleAttributeDefinition def : ALL_ATTRIBUTES) { + DEFINITION_LOOKUP.put(def.getXmlName(), def); + } + } + + private static KeycloakSubsystemWriteAttributeHandler attrHandler = new KeycloakSubsystemWriteAttributeHandler(ALL_ATTRIBUTES); + + protected KeycloakSubsystemDefinition() { + super(KeycloakExtension.PATH_SUBSYSTEM, + KeycloakExtension.getResourceDescriptionResolver("subsystem"), + KeycloakSubsystemAdd.INSTANCE, + KeycloakSubsystemRemoveHandler.INSTANCE + ); + } + + @Override + public void registerOperations(ManagementResourceRegistration resourceRegistration) { + super.registerOperations(resourceRegistration); + resourceRegistration.registerOperationHandler(GenericSubsystemDescribeHandler.DEFINITION, GenericSubsystemDescribeHandler.INSTANCE); + } + + @Override + public void registerAttributes(ManagementResourceRegistration resourceRegistration) { + super.registerAttributes(resourceRegistration); + for (AttributeDefinition attrDef : ALL_ATTRIBUTES) { + resourceRegistration.registerReadWriteAttribute(attrDef, null, attrHandler); + } + } + + public static SimpleAttributeDefinition lookup(String name) { + return DEFINITION_LOOKUP.get(name); + } +} diff --git a/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemParser.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemParser.java new file mode 100755 index 0000000000..05bd55314f --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemParser.java @@ -0,0 +1,82 @@ +/* + * Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.as7; + +import org.jboss.as.controller.PathAddress; +import org.jboss.as.controller.operations.common.Util; +import org.jboss.as.controller.parsing.ParseUtils; +import org.jboss.as.controller.persistence.SubsystemMarshallingContext; +import org.jboss.dmr.ModelNode; +import org.jboss.staxmapper.XMLElementReader; +import org.jboss.staxmapper.XMLElementWriter; +import org.jboss.staxmapper.XMLExtendedStreamReader; +import org.jboss.staxmapper.XMLExtendedStreamWriter; + +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import java.util.List; + +import static org.keycloak.subsystem.server.as7.KeycloakExtension.PATH_SUBSYSTEM; +import static org.keycloak.subsystem.server.as7.KeycloakSubsystemDefinition.WEB_CONTEXT; + +/** + * The subsystem parser, which uses stax to read and write to and from xml + */ +class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader>, XMLElementWriter { + + /** + * {@inheritDoc} + */ + @Override + public void readElement(final XMLExtendedStreamReader reader, final List list) throws XMLStreamException { + // Require no attributes + ParseUtils.requireNoAttributes(reader); + ModelNode addKeycloakSub = Util.createAddOperation(PathAddress.pathAddress(PATH_SUBSYSTEM)); + list.add(addKeycloakSub); + + while (reader.hasNext() && nextTag(reader) != END_ELEMENT) { + if (reader.getLocalName().equals(WEB_CONTEXT.getXmlName())) { + WEB_CONTEXT.parseAndSetParameter(reader.getElementText(), addKeycloakSub, reader); + } else { + throw new XMLStreamException("Unknown keycloak-server subsystem tag: " + reader.getLocalName()); + } + } + } + + // used for debugging + private int nextTag(XMLExtendedStreamReader reader) throws XMLStreamException { + return reader.nextTag(); + } + + /** + * {@inheritDoc} + */ + @Override + public void writeContent(final XMLExtendedStreamWriter writer, final SubsystemMarshallingContext context) throws XMLStreamException { + context.startSubsystemElement(KeycloakExtension.NAMESPACE, false); + writeWebContext(writer, context); + writer.writeEndElement(); + } + + private void writeWebContext(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException { + if (!context.getModelNode().get(WEB_CONTEXT.getName()).isDefined()) { + return; + } + + WEB_CONTEXT.marshallAsElement(context.getModelNode(), writer); + } +} diff --git a/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemRemoveHandler.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemRemoveHandler.java new file mode 100644 index 0000000000..a112b4c681 --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemRemoveHandler.java @@ -0,0 +1,65 @@ +/* + * Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.as7; + +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.as.controller.OperationStepHandler; +import org.jboss.as.controller.PathAddress; +import org.jboss.as.controller.PathElement; +import org.jboss.as.controller.ReloadRequiredRemoveStepHandler; +import org.jboss.as.controller.operations.common.Util; +import org.jboss.dmr.ModelNode; + +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEPLOYMENT; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE; +import org.jboss.as.controller.registry.ImmutableManagementResourceRegistration; + +/** + * Remove an auth-server from a realm. + * + * @author Stan Silvert ssilvert@redhat.com (C) 2014 Red Hat Inc. + */ +public final class KeycloakSubsystemRemoveHandler extends ReloadRequiredRemoveStepHandler { + + static KeycloakSubsystemRemoveHandler INSTANCE = new KeycloakSubsystemRemoveHandler(); + + private KeycloakSubsystemRemoveHandler() {} + + @Override + protected void performRemove(OperationContext context, ModelNode operation, ModelNode model) throws OperationFailedException { + String deploymentName = ServerUtil.getDeploymentName(operation); + KeycloakAdapterConfigService.INSTANCE.setWebContext(null); + + if (requiresRuntime(context)) { // don't do this on a domain controller + addStepToRemoveServerWar(context, deploymentName); + } + + super.performRemove(context, operation, model); + } + + private void addStepToRemoveServerWar(OperationContext context, String deploymentName) { + PathAddress deploymentAddress = PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT, deploymentName)); + ModelNode op = Util.createOperation(REMOVE, deploymentAddress); + context.addStep(op, getRemoveHandler(context, deploymentAddress), OperationContext.Stage.MODEL); + } + + private OperationStepHandler getRemoveHandler(OperationContext context, PathAddress address) { + ImmutableManagementResourceRegistration rootResourceRegistration = context.getRootResourceRegistration(); + return rootResourceRegistration.getOperationHandler(address, REMOVE); + } +} diff --git a/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemWriteAttributeHandler.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemWriteAttributeHandler.java new file mode 100755 index 0000000000..0200254395 --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/KeycloakSubsystemWriteAttributeHandler.java @@ -0,0 +1,71 @@ +/* + * Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.as7; + +import org.jboss.as.controller.AttributeDefinition; +import org.jboss.as.controller.SimpleAttributeDefinition; + +import java.util.List; +import org.jboss.as.controller.ModelOnlyWriteAttributeHandler; +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.as.controller.registry.Resource; +import org.jboss.dmr.ModelNode; + +/** + * Update an attribute on an Auth Server. + * + * @author Stan Silvert ssilvert@redhat.com (C) 2014 Red Hat Inc. + */ +public class KeycloakSubsystemWriteAttributeHandler extends ModelOnlyWriteAttributeHandler { //extends ReloadRequiredWriteAttributeHandler { + + public KeycloakSubsystemWriteAttributeHandler(List definitions) { + this(definitions.toArray(new AttributeDefinition[definitions.size()])); + } + + public KeycloakSubsystemWriteAttributeHandler(AttributeDefinition... definitions) { + super(definitions); + } + + @Override + protected void finishModelStage(OperationContext context, ModelNode operation, String attributeName, ModelNode newValue, ModelNode oldValue, Resource model) throws OperationFailedException { + if (!context.isNormalServer() || attribNotChanging(attributeName, newValue, oldValue)) { + super.finishModelStage(context, operation, attributeName, newValue, oldValue, model); + return; + } + + String deploymentName = ServerUtil.getDeploymentName(operation); + + if (attributeName.equals(KeycloakSubsystemDefinition.WEB_CONTEXT.getName())) { + KeycloakAdapterConfigService.INSTANCE.setWebContext(newValue.asString()); + ServerUtil.addStepToRedeployServerWar(context, deploymentName); + } + + super.finishModelStage(context, operation, attributeName, newValue, oldValue, model); + } + + private boolean attribNotChanging(String attributeName, ModelNode newValue, ModelNode oldValue) { + SimpleAttributeDefinition attribDef = KeycloakSubsystemDefinition.lookup(attributeName); + if (!oldValue.isDefined()) { + oldValue = attribDef.getDefaultValue(); + } + if (!newValue.isDefined()) { + newValue = attribDef.getDefaultValue(); + } + return newValue.equals(oldValue); + } +} diff --git a/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/ServerUtil.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/ServerUtil.java new file mode 100644 index 0000000000..a31beecaf4 --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/as7/ServerUtil.java @@ -0,0 +1,163 @@ +/* + * Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.as7; + +import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.as.controller.OperationStepHandler; +import org.jboss.as.controller.PathAddress; +import org.jboss.as.controller.PathElement; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADDRESS; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ARCHIVE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CONTENT; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEPLOYMENT; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ENABLED; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PERSISTENT; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PATH; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REDEPLOY; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RUNTIME_NAME; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.URL; +import org.jboss.as.controller.operations.common.Util; +import org.jboss.as.controller.registry.ImmutableManagementResourceRegistration; + +import org.jboss.dmr.ModelNode; +import org.jboss.modules.Module; +import org.jboss.modules.ModuleIdentifier; +import org.jboss.modules.ModuleLoadException; + +/** + * Utility methods that help assemble and start an auth server. + * + * @author Stan Silvert ssilvert@redhat.com (C) 2014 Red Hat Inc. + */ +public class ServerUtil { + + private static final ModuleIdentifier KEYCLOAK_SUBSYSTEM = ModuleIdentifier.create("org.keycloak.keycloak-server-subsystem"); + + private final String deploymentName; + private final Module subsysModule; + private final String keycloakVersion; + private final boolean isServerWarExploded; + private final URI serverWar; + + ServerUtil(ModelNode operation) { + this.deploymentName = getDeploymentName(operation); + this.subsysModule = findSubsysModule(); + this.keycloakVersion = subsysModule.getProperty("keycloak-version"); + this.isServerWarExploded = Boolean.parseBoolean(subsysModule.getProperty("server-war-exploded")); + this.serverWar = findServerWarUri(); + } + + private Module findSubsysModule() { + try { + return Module.getModuleFromCallerModuleLoader(KEYCLOAK_SUBSYSTEM); + } catch (ModuleLoadException e) { + throw new IllegalStateException("Can't find Keycloak subsystem.", e); + } + } + + private URI findServerWarUri() throws IllegalStateException { + try { + URL subsysResource = this.subsysModule.getExportedResource("module.xml"); + File subsysDir = new File(subsysResource.toURI()).getParentFile(); + File serverWarDir = new File(subsysDir, "server-war"); + if (this.isServerWarExploded) { + return serverWarDir.toURI(); + } else { + return new File(serverWarDir, "keycloak-server-" + keycloakVersion + ".war").toURI(); + } + } catch (URISyntaxException e) { + throw new IllegalStateException(e); + } catch (IllegalArgumentException e) { + throw new IllegalStateException(e); + } + } + + void addStepToUploadServerWar(OperationContext context) throws OperationFailedException { + PathAddress deploymentAddress = deploymentAddress(deploymentName); + ModelNode op = Util.createOperation(ADD, deploymentAddress); + + // this is required for deployment to take place + op.get(ENABLED).set(true); + + // prevents writing this deployment out to standalone.xml + op.get(PERSISTENT).set(false); + + // Owner attribute is valid starting with WidlFly 9. Ignored in WildFly 8 + op.get("owner").set(new ModelNode().add("subsystem", KeycloakExtension.SUBSYSTEM_NAME)); + + if (serverWar == null) { + throw new OperationFailedException("Keycloak Server WAR not found in keycloak-server-subsystem module"); + } + + op.get(CONTENT).add(makeContentItem()); + + context.addStep(op, getHandler(context, deploymentAddress, ADD), OperationContext.Stage.MODEL); + } + + private ModelNode makeContentItem() throws OperationFailedException { + ModelNode contentItem = new ModelNode(); + + if (this.isServerWarExploded) { + String urlString = new File(serverWar).getAbsolutePath(); + contentItem.get(PATH).set(urlString); + contentItem.get(ARCHIVE).set(false); + } else { + String urlString = serverWar.toString(); + contentItem.get(URL).set(urlString); + } + + return contentItem; + } + + static void addStepToRedeployServerWar(OperationContext context, String deploymentName) { + addDeploymentAction(context, REDEPLOY, deploymentName); + } + + private static void addDeploymentAction(OperationContext context, String operation, String deploymentName) { + if (!context.isNormalServer()) { + return; + } + PathAddress deploymentAddress = deploymentAddress(deploymentName); + ModelNode op = Util.createOperation(operation, deploymentAddress); + op.get(RUNTIME_NAME).set(deploymentName); + context.addStep(op, getHandler(context, deploymentAddress, operation), OperationContext.Stage.MODEL); + } + + private static PathAddress deploymentAddress(String deploymentName) { + return PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT, deploymentName)); + } + + static OperationStepHandler getHandler(OperationContext context, PathAddress address, String opName) { + ImmutableManagementResourceRegistration rootResourceRegistration = context.getRootResourceRegistration(); + return rootResourceRegistration.getOperationHandler(address, opName); + } + + static String getDeploymentName(ModelNode operation) { + String deploymentName = Util.getNameFromAddress(operation.get(ADDRESS)); + if (!deploymentName.toLowerCase().endsWith(".war")) { + deploymentName += ".war"; + } + + return deploymentName; + } +} diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakLogger.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakLogger.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakLogger.java rename to integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakLogger.java diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakMessages.java b/integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakMessages.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakMessages.java rename to integration/as7-eap6/as7-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakMessages.java diff --git a/integration/as7-eap6/as7-server-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension b/integration/as7-eap6/as7-server-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension new file mode 100644 index 0000000000..e69bf09a0d --- /dev/null +++ b/integration/as7-eap6/as7-server-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension @@ -0,0 +1 @@ +org.keycloak.subsystem.server.as7.KeycloakExtension diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/resources/org/keycloak/subsystem/server/extension/LocalDescriptions.properties b/integration/as7-eap6/as7-server-subsystem/src/main/resources/org/keycloak/subsystem/server/as7/LocalDescriptions.properties similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/resources/org/keycloak/subsystem/server/extension/LocalDescriptions.properties rename to integration/as7-eap6/as7-server-subsystem/src/main/resources/org/keycloak/subsystem/server/as7/LocalDescriptions.properties diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/resources/schema/wildfly-keycloak-server_1_1.xsd b/integration/as7-eap6/as7-server-subsystem/src/main/resources/schema/wildfly-keycloak-server_1_1.xsd similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/resources/schema/wildfly-keycloak-server_1_1.xsd rename to integration/as7-eap6/as7-server-subsystem/src/main/resources/schema/wildfly-keycloak-server_1_1.xsd diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/resources/subsystem-templates/keycloak-datasources.xml b/integration/as7-eap6/as7-server-subsystem/src/main/resources/subsystem-templates/keycloak-datasources.xml similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/resources/subsystem-templates/keycloak-datasources.xml rename to integration/as7-eap6/as7-server-subsystem/src/main/resources/subsystem-templates/keycloak-datasources.xml diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/resources/subsystem-templates/keycloak-server.xml b/integration/as7-eap6/as7-server-subsystem/src/main/resources/subsystem-templates/keycloak-server.xml similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/resources/subsystem-templates/keycloak-server.xml rename to integration/as7-eap6/as7-server-subsystem/src/main/resources/subsystem-templates/keycloak-server.xml diff --git a/integration/wildfly/wildfly-server-subsystem/src/test/resources/org/keycloak/subsystem/server/extension/keycloak-server-1.1.xml b/integration/as7-eap6/as7-server-subsystem/src/test/resources/org/keycloak/subsystem/server/extension/keycloak-server-1.1.xml similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/test/resources/org/keycloak/subsystem/server/extension/keycloak-server-1.1.xml rename to integration/as7-eap6/as7-server-subsystem/src/test/resources/org/keycloak/subsystem/server/extension/keycloak-server-1.1.xml diff --git a/integration/as7-eap6/pom.xml b/integration/as7-eap6/pom.xml index 9917521e12..25ee1ba379 100644 --- a/integration/as7-eap6/pom.xml +++ b/integration/as7-eap6/pom.xml @@ -16,5 +16,6 @@ as7-adapter as7-subsystem + as7-server-subsystem \ No newline at end of file diff --git a/integration/wildfly/pom.xml b/integration/wildfly/pom.xml index 588bf10153..bd19c787af 100644 --- a/integration/wildfly/pom.xml +++ b/integration/wildfly/pom.xml @@ -16,8 +16,8 @@ wildfly-adapter wildfly-extensions - wildfly-server-subsystem wf8-subsystem wf9-subsystem + wf9-server-subsystem \ No newline at end of file diff --git a/integration/wildfly/wildfly-server-subsystem/pom.xml b/integration/wildfly/wf9-server-subsystem/pom.xml similarity index 97% rename from integration/wildfly/wildfly-server-subsystem/pom.xml rename to integration/wildfly/wf9-server-subsystem/pom.xml index 7bc530554b..8c24055c3b 100755 --- a/integration/wildfly/wildfly-server-subsystem/pom.xml +++ b/integration/wildfly/wf9-server-subsystem/pom.xml @@ -24,8 +24,8 @@ ../../../pom.xml - keycloak-wildfly-server-subsystem - Keycloak Server Subsystem + keycloak-wf9-server-subsystem + Keycloak Wildfly 9 Server Subsystem jar diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakAdapterConfigService.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakAdapterConfigService.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakAdapterConfigService.java rename to integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakAdapterConfigService.java diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakExtension.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakExtension.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakExtension.java rename to integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakExtension.java diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java rename to integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemAdd.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemAdd.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemAdd.java rename to integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemAdd.java diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemDefinition.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemDefinition.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemDefinition.java rename to integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemDefinition.java diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemParser.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemParser.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemParser.java rename to integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemParser.java diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemRemoveHandler.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemRemoveHandler.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemRemoveHandler.java rename to integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemRemoveHandler.java diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemWriteAttributeHandler.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemWriteAttributeHandler.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemWriteAttributeHandler.java rename to integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemWriteAttributeHandler.java diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/ServerUtil.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/ServerUtil.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/ServerUtil.java rename to integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/ServerUtil.java diff --git a/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakLogger.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakLogger.java new file mode 100755 index 0000000000..bf6053b60a --- /dev/null +++ b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakLogger.java @@ -0,0 +1,39 @@ +/* + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.logging; + +import org.jboss.logging.BasicLogger; +import org.jboss.logging.Logger; +import org.jboss.logging.annotations.LogMessage; +import org.jboss.logging.annotations.Message; +import org.jboss.logging.annotations.MessageLogger; + +import static org.jboss.logging.Logger.Level.INFO; + +/** + * This interface to be fleshed out later when error messages are fully externalized. + * + * @author Stan Silvert ssilvert@redhat.com (C) 2013 Red Hat Inc. + */ +@MessageLogger(projectCode = "KEYCLOAK") +public interface KeycloakLogger extends BasicLogger { + + /** + * A logger with a category of the package name. + */ + KeycloakLogger ROOT_LOGGER = Logger.getMessageLogger(KeycloakLogger.class, "org.jboss.keycloak"); +} diff --git a/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakMessages.java b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakMessages.java new file mode 100755 index 0000000000..710c05420a --- /dev/null +++ b/integration/wildfly/wf9-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakMessages.java @@ -0,0 +1,34 @@ +/* + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.keycloak.subsystem.server.logging; + +import org.jboss.logging.Messages; +import org.jboss.logging.annotations.MessageBundle; + +/** + * This interface to be fleshed out later when error messages are fully externalized. + * + * @author Stan Silvert ssilvert@redhat.com (C) 2012 Red Hat Inc. + */ +@MessageBundle(projectCode = "KEYCLOAK") +public interface KeycloakMessages { + + /** + * The messages + */ + KeycloakMessages MESSAGES = Messages.getBundle(KeycloakMessages.class); +} diff --git a/integration/wildfly/wildfly-server-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension b/integration/wildfly/wf9-server-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension rename to integration/wildfly/wf9-server-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension diff --git a/integration/wildfly/wf9-server-subsystem/src/main/resources/org/keycloak/subsystem/server/extension/LocalDescriptions.properties b/integration/wildfly/wf9-server-subsystem/src/main/resources/org/keycloak/subsystem/server/extension/LocalDescriptions.properties new file mode 100755 index 0000000000..909e6b3818 --- /dev/null +++ b/integration/wildfly/wf9-server-subsystem/src/main/resources/org/keycloak/subsystem/server/extension/LocalDescriptions.properties @@ -0,0 +1,4 @@ +keycloak-server.subsystem=Keycloak subsystem +keycloak-server.subsystem.add=Operation Adds Keycloak subsystem +keycloak-server.subsystem.remove=Operation removes Keycloak subsystem +keycloak-server.subsystem.web-context=Web context where Keycloak server is bound. Default value is 'auth'. diff --git a/integration/wildfly/wf9-server-subsystem/src/main/resources/schema/wildfly-keycloak-server_1_1.xsd b/integration/wildfly/wf9-server-subsystem/src/main/resources/schema/wildfly-keycloak-server_1_1.xsd new file mode 100755 index 0000000000..b346d36162 --- /dev/null +++ b/integration/wildfly/wf9-server-subsystem/src/main/resources/schema/wildfly-keycloak-server_1_1.xsd @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + diff --git a/integration/wildfly/wf9-server-subsystem/src/main/resources/subsystem-templates/keycloak-datasources.xml b/integration/wildfly/wf9-server-subsystem/src/main/resources/subsystem-templates/keycloak-datasources.xml new file mode 100644 index 0000000000..114545f388 --- /dev/null +++ b/integration/wildfly/wf9-server-subsystem/src/main/resources/subsystem-templates/keycloak-datasources.xml @@ -0,0 +1,22 @@ + + + + org.jboss.as.connector + + + + jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE + h2 + + sa + sa + + + + + org.h2.jdbcx.JdbcDataSource + + + + + diff --git a/integration/wildfly/wf9-server-subsystem/src/main/resources/subsystem-templates/keycloak-server.xml b/integration/wildfly/wf9-server-subsystem/src/main/resources/subsystem-templates/keycloak-server.xml new file mode 100644 index 0000000000..4a83086787 --- /dev/null +++ b/integration/wildfly/wf9-server-subsystem/src/main/resources/subsystem-templates/keycloak-server.xml @@ -0,0 +1,8 @@ + + + + org.keycloak.keycloak-server-subsystem + + auth + + diff --git a/integration/wildfly/wildfly-server-subsystem/src/test/java/org/keycloak/subsystem/server/extension/SubsystemParsingTestCase.java b/integration/wildfly/wf9-server-subsystem/src/test/java/org/keycloak/subsystem/server/extension/SubsystemParsingTestCase.java similarity index 100% rename from integration/wildfly/wildfly-server-subsystem/src/test/java/org/keycloak/subsystem/server/extension/SubsystemParsingTestCase.java rename to integration/wildfly/wf9-server-subsystem/src/test/java/org/keycloak/subsystem/server/extension/SubsystemParsingTestCase.java diff --git a/integration/wildfly/wf9-server-subsystem/src/test/resources/org/keycloak/subsystem/server/extension/keycloak-server-1.1.xml b/integration/wildfly/wf9-server-subsystem/src/test/resources/org/keycloak/subsystem/server/extension/keycloak-server-1.1.xml new file mode 100644 index 0000000000..bc8f11a778 --- /dev/null +++ b/integration/wildfly/wf9-server-subsystem/src/test/resources/org/keycloak/subsystem/server/extension/keycloak-server-1.1.xml @@ -0,0 +1,3 @@ + + auth + \ No newline at end of file diff --git a/pom.xml b/pom.xml index a8dcdb715b..b5852b7e38 100755 --- a/pom.xml +++ b/pom.xml @@ -882,6 +882,11 @@ keycloak-as7-subsystem ${project.version} + + org.keycloak + keycloak-as7-server-subsystem + ${project.version} + org.keycloak keycloak-wf8-subsystem @@ -893,6 +898,10 @@ ${project.version} + org.keycloak + keycloak-wf9-server-subsystem + ${project.version} + org.keycloak keycloak-subsystem ${project.version} @@ -1084,7 +1093,7 @@ org.keycloak - keycloak-jboss-modules + keycloak-eap6-server-modules ${project.version} zip @@ -1114,7 +1123,7 @@ org.keycloak - keycloak-server-overlay + keycloak-wf9-server-overlay ${project.version} zip