keycloak-aplcache
Changes
distribution/modules/build.xml 501(+365 -136)
distribution/modules/pom.xml 23(+18 -5)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml 18(+18 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml 24(+24 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml 22(+1 -21)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml 24(+2 -22)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-subsystem/main/module.xml 22(+1 -21)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml 14(+14 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml 15(+15 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml 15(+15 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml 17(+17 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml 23(+23 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml 19(+19 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml 17(+17 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml 25(+3 -22)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml 20(+20 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml 17(+17 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml 24(+24 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml 16(+16 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml 19(+19 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml 17(+17 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml 24(+24 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml 22(+22 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml 24(+24 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml 25(+25 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml 25(+25 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml 26(+26 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml 18(+18 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml 19(+19 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml 19(+19 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml 20(+20 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml 22(+1 -21)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-js-adapter/main/module.xml 12(+12 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml 23(+23 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml 18(+18 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml 26(+26 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml 17(+17 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml 22(+22 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml 19(+19 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml 18(+18 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-jpa/main/module.xml 20(+20 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mem/main/module.xml 16(+16 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mongo/main/module.xml 18(+18 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-picketlink-api/main/module.xml 21(+21 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-picketlink-ldap/main/module.xml 21(+21 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml 30(+30 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-server/main/module.xml 64(+64 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml 79(+79 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml 20(+20 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml 22(+22 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml 22(+22 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml 22(+22 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml 23(+23 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml 16(+16 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml 17(+17 -0)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml 24(+2 -22)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml 24(+2 -22)
distribution/modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml 13(+13 -0)
distribution/pom.xml 1(+1 -0)
distribution/subsystem-war/pom.xml 40(+40 -0)
forms/login-freemarker/pom.xml 11(+5 -6)
Details
diff --git a/core/src/main/java/org/keycloak/util/MimeTypeUtil.java b/core/src/main/java/org/keycloak/util/MimeTypeUtil.java
new file mode 100644
index 0000000..75270bd
--- /dev/null
+++ b/core/src/main/java/org/keycloak/util/MimeTypeUtil.java
@@ -0,0 +1,29 @@
+package org.keycloak.util;
+
+import javax.activation.MimetypesFileTypeMap;
+import java.io.File;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public class MimeTypeUtil {
+
+ private static MimetypesFileTypeMap map = new MimetypesFileTypeMap();
+ static {
+ map.addMimeTypes("text/css css CSS");
+ map.addMimeTypes("text/javascript js JS");
+ map.addMimeTypes("text/javascript js JS");
+ map.addMimeTypes("image/png png PNG");
+ map.addMimeTypes("image/svg+xml svg SVG");
+ map.addMimeTypes("text/html html htm HTML HTM");
+ }
+
+ public static String getContentType(File file) {
+ return map.getContentType(file);
+ }
+
+ public static String getContentType(String path) {
+ return map.getContentType(path);
+ }
+
+}
diff --git a/distribution/appliance-dist/assembly.xml b/distribution/appliance-dist/assembly.xml
index 37f59db..9001f26 100755
--- a/distribution/appliance-dist/assembly.xml
+++ b/distribution/appliance-dist/assembly.xml
@@ -37,9 +37,6 @@
<fileSet>
<directory>${project.build.directory}/unpacked/modules</directory>
<outputDirectory>keycloak/modules/system/layers/base</outputDirectory>
- <includes>
- <include>org/picketlink/**</include>
- </includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/deployments/auth-server.war/WEB-INF/classes/META-INF
distribution/modules/build.xml 501(+365 -136)
diff --git a/distribution/modules/build.xml b/distribution/modules/build.xml
index 69eb308..208e061 100755
--- a/distribution/modules/build.xml
+++ b/distribution/modules/build.xml
@@ -1,136 +1,365 @@
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<project name="module-repository" basedir="." default="all">
-
- <import file="lib.xml"/>
-
- <property name="output.dir" value="target"/>
-
- <target name="all">
- <antcall target="modules">
- <param name="mavenized.modules" value="false"/>
- <param name="output.dir" value="target"/>
- </antcall>
- </target>
-
-
- <target name="modules">
- <!--
- ~ Complete list of modules to assemble.
- ~
- ~ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ~ +++++++ KEEP THIS LIST ALPHABETICAL BY MODULE NAME! +++++++
- ~ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- -->
-
- <module-def name="net.iharder.base64">
- <maven-resource group="net.iharder" artifact="base64"/>
- </module-def>
-
- <module-def name="org.bouncycastle">
- <maven-resource group="org.bouncycastle" artifact="bcprov-jdk15on"/>
- </module-def>
-
- <module-def name="org.jboss.aesh">
- <maven-resource group="org.jboss.aesh" artifact="aesh"/>
- </module-def>
-
- <module-def name="org.jboss.as.cli">
- <maven-resource group="org.wildfly.core" artifact="wildfly-cli"/>
- </module-def>
-
- <module-def name="org.keycloak.keycloak-core">
- <maven-resource group="org.keycloak" artifact="keycloak-core"/>
- </module-def>
-
- <module-def name="org.keycloak.keycloak-adapter-core">
- <maven-resource group="org.keycloak" artifact="keycloak-adapter-core"/>
- </module-def>
-
- <module-def name="org.keycloak.keycloak-jboss-adapter-core">
- <maven-resource group="org.keycloak" artifact="keycloak-jboss-adapter-core"/>
- </module-def>
-
- <module-def name="org.keycloak.keycloak-as7-adapter">
- <maven-resource group="org.keycloak" artifact="keycloak-as7-adapter"/>
- <maven-resource group="org.keycloak" artifact="keycloak-tomcat-core-adapter"/>
- </module-def>
-
- <module-def name="org.keycloak.keycloak-undertow-adapter">
- <maven-resource group="org.keycloak" artifact="keycloak-undertow-adapter"/>
- </module-def>
-
- <module-def name="org.keycloak.keycloak-wildfly-adapter">
- <maven-resource group="org.keycloak" artifact="keycloak-wildfly-adapter"/>
- </module-def>
-
- <module-def name="org.keycloak.keycloak-subsystem">
- <maven-resource group="org.keycloak" artifact="keycloak-subsystem"/>
- </module-def>
- <module-def name="org.keycloak.keycloak-as7-subsystem">
- <maven-resource group="org.keycloak" artifact="keycloak-as7-subsystem"/>
- </module-def>
- <module-def name="org.picketlink">
- </module-def>
- <module-def name="org.picketlink.common">
- <maven-resource group="org.picketlink" artifact="picketlink-common"/>
- </module-def>
- <module-def name="org.picketlink.config">
- <maven-resource group="org.picketlink" artifact="picketlink-config"/>
- </module-def>
- <module-def name="org.picketlink.core">
- <maven-resource group="org.picketlink" artifact="picketlink-impl"/>
- </module-def>
- <module-def name="org.picketlink.core.api">
- <maven-resource group="org.picketlink" artifact="picketlink-api"/>
- </module-def>
- <module-def name="org.picketlink.federation">
- <maven-resource group="org.picketlink" artifact="picketlink-federation"/>
- </module-def>
- <module-def name="org.picketlink.federation.bindings">
- <maven-resource group="org.picketlink" artifact="picketlink-wildfly-common"/>
- <maven-resource group="org.picketlink" artifact="picketlink-tomcat-common"/>
- <maven-resource group="org.picketlink" artifact="picketlink-tomcat5-single"/>
- <maven-resource group="org.picketlink" artifact="picketlink-jbas-common"/>
- <maven-resource group="org.picketlink" artifact="picketlink-jbas7-single"/>
- </module-def>
- <module-def name="org.picketlink.idm">
- <maven-resource group="org.picketlink" artifact="picketlink-idm-impl"/>
- </module-def>
- <module-def name="org.picketlink.idm.api">
- <maven-resource group="org.picketlink" artifact="picketlink-idm-api"/>
- </module-def>
- <module-def name="org.picketlink.idm.schema">
- <maven-resource group="org.picketlink" artifact="picketlink-idm-simple-schema"/>
- </module-def>
- </target>
-
- <target name="clean-target">
- <delete dir="${output.dir}"/>
- </target>
-
- <target name="clean" depends="clean-target">
- <delete file="maven-ant-tasks.jar"/>
- </target>
-
-</project>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<project name="module-repository" basedir="." default="all">
+
+ <import file="lib.xml"/>
+
+ <property name="output.dir" value="target"/>
+
+ <target name="all">
+ <antcall target="modules">
+ <param name="mavenized.modules" value="false"/>
+ <param name="output.dir" value="target"/>
+ </antcall>
+ </target>
+
+
+ <target name="modules">
+
+ <!-- server min dependencies -->
+
+ <module-def name="org.keycloak.keycloak-core">
+ <maven-resource group="org.keycloak" artifact="keycloak-core"/>
+ </module-def>
+
+ <module-def name="net.iharder.base64">
+ <maven-resource group="net.iharder" artifact="base64"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-broker-core">
+ <maven-resource group="org.keycloak" artifact="keycloak-broker-core"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-broker-oidc">
+ <maven-resource group="org.keycloak" artifact="keycloak-broker-oidc"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-broker-saml">
+ <maven-resource group="org.keycloak" artifact="keycloak-broker-saml"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-core-jaxrs">
+ <maven-resource group="org.keycloak" artifact="keycloak-core-jaxrs"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-services">
+ <maven-resource group="org.keycloak" artifact="keycloak-services"/>
+ </module-def>
+
+ <module-def name="com.google.zxing.core">
+ <maven-resource group="com.google.zxing" artifact="core"/>
+ </module-def>
+
+ <module-def name="com.google.zxing.javase">
+ <maven-resource group="com.google.zxing" artifact="javase"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-model-api">
+ <maven-resource group="org.keycloak" artifact="keycloak-model-api"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-invalidation-cache-model">
+ <maven-resource group="org.keycloak" artifact="keycloak-invalidation-cache-model"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-events-api">
+ <maven-resource group="org.keycloak" artifact="keycloak-events-api"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-events-jpa">
+ <maven-resource group="org.keycloak" artifact="keycloak-events-jpa"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-events-jboss-logging">
+ <maven-resource group="org.keycloak" artifact="keycloak-events-jboss-logging"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-js-adapter">
+ <maven-resource group="org.keycloak" artifact="keycloak-js-adapter"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-social-core">
+ <maven-resource group="org.keycloak" artifact="keycloak-social-core"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-forms-common-freemarker">
+ <maven-resource group="org.keycloak" artifact="keycloak-forms-common-freemarker"/>
+ </module-def>
+
+ <module-def name="org.freemarker">
+ <maven-resource group="org.freemarker" artifact="freemarker"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-forms-common-themes">
+ <maven-resource group="org.keycloak" artifact="keycloak-forms-common-themes"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-account-api">
+ <maven-resource group="org.keycloak" artifact="keycloak-account-api"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-account-freemarker">
+ <maven-resource group="org.keycloak" artifact="keycloak-account-freemarker"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-email-api">
+ <maven-resource group="org.keycloak" artifact="keycloak-email-api"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-email-freemarker">
+ <maven-resource group="org.keycloak" artifact="keycloak-email-freemarker"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-login-api">
+ <maven-resource group="org.keycloak" artifact="keycloak-login-api"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-login-freemarker">
+ <maven-resource group="org.keycloak" artifact="keycloak-login-freemarker"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-timer-api">
+ <maven-resource group="org.keycloak" artifact="keycloak-timer-api"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-timer-basic">
+ <maven-resource group="org.keycloak" artifact="keycloak-timer-basic"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-export-import-api">
+ <maven-resource group="org.keycloak" artifact="keycloak-export-import-api"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-export-import-dir">
+ <maven-resource group="org.keycloak" artifact="keycloak-export-import-dir"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-export-import-single-file">
+ <maven-resource group="org.keycloak" artifact="keycloak-export-import-single-file"/>
+ </module-def>
+
+ <!-- server all dependencies -->
+
+ <module-def name="org.keycloak.keycloak-connections-jpa">
+ <maven-resource group="org.keycloak" artifact="keycloak-connections-jpa"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-connections-jpa-liquibase">
+ <maven-resource group="org.keycloak" artifact="keycloak-connections-jpa-liquibase"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-connections-infinispan">
+ <maven-resource group="org.keycloak" artifact="keycloak-connections-infinispan"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-model-jpa">
+ <maven-resource group="org.keycloak" artifact="keycloak-model-jpa"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-model-sessions-mem">
+ <maven-resource group="org.keycloak" artifact="keycloak-model-sessions-mem"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-model-sessions-jpa">
+ <maven-resource group="org.keycloak" artifact="keycloak-model-sessions-jpa"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-model-sessions-mongo">
+ <maven-resource group="org.keycloak" artifact="keycloak-model-sessions-mongo"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-model-sessions-infinispan">
+ <maven-resource group="org.keycloak" artifact="keycloak-model-sessions-infinispan"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-invalidation-cache-infinispan">
+ <maven-resource group="org.keycloak" artifact="keycloak-invalidation-cache-infinispan"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-events-jpa">
+ <maven-resource group="org.keycloak" artifact="keycloak-events-jpa"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-events-jboss-logging">
+ <maven-resource group="org.keycloak" artifact="keycloak-events-jboss-logging"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-events-email">
+ <maven-resource group="org.keycloak" artifact="keycloak-events-email"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-social-github">
+ <maven-resource group="org.keycloak" artifact="keycloak-social-github"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-social-google">
+ <maven-resource group="org.keycloak" artifact="keycloak-social-google"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-social-twitter">
+ <maven-resource group="org.keycloak" artifact="keycloak-social-twitter"/>
+ </module-def>
+
+ <module-def name="org.twitter4j">
+ <maven-resource group="org.twitter4j" artifact="twitter4j-core"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-social-facebook">
+ <maven-resource group="org.keycloak" artifact="keycloak-social-facebook"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-ldap-federation">
+ <maven-resource group="org.keycloak" artifact="keycloak-ldap-federation"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-picketlink-api">
+ <maven-resource group="org.keycloak" artifact="keycloak-picketlink-api"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-picketlink-ldap">
+ <maven-resource group="org.keycloak" artifact="keycloak-picketlink-ldap"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-saml-protocol">
+ <maven-resource group="org.keycloak" artifact="keycloak-saml-protocol"/>
+ </module-def>
+
+ <!-- mongo -->
+
+ <module-def name="org.keycloak.keycloak-connections-mongo">
+ <maven-resource group="org.keycloak" artifact="keycloak-connections-mongo"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-model-mongo">
+ <maven-resource group="org.keycloak" artifact="keycloak-model-mongo"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-events-mongo">
+ <maven-resource group="org.keycloak" artifact="keycloak-events-mongo"/>
+ </module-def>
+
+ <module-def name="org.mongodb.mongo-java-driver">
+ <maven-resource group="org.mongodb" artifact="mongo-java-driver"/>
+ </module-def>
+
+ <!-- export/import -->
+
+ <module-def name="org.keycloak.keycloak-export-import-zip">
+ <maven-resource group="org.keycloak" artifact="keycloak-export-import-zip"/>
+ </module-def>
+ <module-def name="de.idyl.winzipaes">
+ <maven-resource group="de.idyl" artifact="winzipaes"/>
+ </module-def>
+
+ <module-def name="org.liquibase">
+ <maven-resource group="org.liquibase" artifact="liquibase-core"/>
+ </module-def>
+
+
+
+
+
+
+ <!-- subsystems -->
+
+ <module-def name="org.keycloak.keycloak-server"></module-def>
+
+ <module-def name="org.jboss.aesh">
+ <maven-resource group="org.jboss.aesh" artifact="aesh"/>
+ </module-def>
+
+ <module-def name="org.jboss.as.cli">
+ <maven-resource group="org.wildfly.core" artifact="wildfly-cli"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-adapter-core">
+ <maven-resource group="org.keycloak" artifact="keycloak-adapter-core"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-jboss-adapter-core">
+ <maven-resource group="org.keycloak" artifact="keycloak-jboss-adapter-core"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-as7-adapter">
+ <maven-resource group="org.keycloak" artifact="keycloak-as7-adapter"/>
+ <maven-resource group="org.keycloak" artifact="keycloak-tomcat-core-adapter"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-undertow-adapter">
+ <maven-resource group="org.keycloak" artifact="keycloak-undertow-adapter"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-wildfly-adapter">
+ <maven-resource group="org.keycloak" artifact="keycloak-wildfly-adapter"/>
+ </module-def>
+
+ <module-def name="org.keycloak.keycloak-subsystem">
+ <maven-resource group="org.keycloak" artifact="keycloak-subsystem"/>
+ </module-def>
+ <module-def name="org.keycloak.keycloak-as7-subsystem">
+ <maven-resource group="org.keycloak" artifact="keycloak-as7-subsystem"/>
+ </module-def>
+ <module-def name="org.picketlink">
+ </module-def>
+ <module-def name="org.picketlink.common">
+ <maven-resource group="org.picketlink" artifact="picketlink-common"/>
+ </module-def>
+ <module-def name="org.picketlink.config">
+ <maven-resource group="org.picketlink" artifact="picketlink-config"/>
+ </module-def>
+ <module-def name="org.picketlink.core">
+ <maven-resource group="org.picketlink" artifact="picketlink-impl"/>
+ </module-def>
+ <module-def name="org.picketlink.core.api">
+ <maven-resource group="org.picketlink" artifact="picketlink-api"/>
+ </module-def>
+ <module-def name="org.picketlink.federation">
+ <maven-resource group="org.picketlink" artifact="picketlink-federation"/>
+ </module-def>
+ <module-def name="org.picketlink.federation.bindings">
+ <maven-resource group="org.picketlink" artifact="picketlink-wildfly-common"/>
+ <maven-resource group="org.picketlink" artifact="picketlink-tomcat-common"/>
+ <maven-resource group="org.picketlink" artifact="picketlink-tomcat5-single"/>
+ <maven-resource group="org.picketlink" artifact="picketlink-jbas-common"/>
+ <maven-resource group="org.picketlink" artifact="picketlink-jbas7-single"/>
+ </module-def>
+ <module-def name="org.picketlink.idm">
+ <maven-resource group="org.picketlink" artifact="picketlink-idm-impl"/>
+ </module-def>
+ <module-def name="org.picketlink.idm.api">
+ <maven-resource group="org.picketlink" artifact="picketlink-idm-api"/>
+ </module-def>
+ <module-def name="org.picketlink.idm.schema">
+ <maven-resource group="org.picketlink" artifact="picketlink-idm-simple-schema"/>
+ </module-def>
+ </target>
+
+ <target name="clean-target">
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="clean" depends="clean-target">
+ <delete file="maven-ant-tasks.jar"/>
+ </target>
+
+</project>
distribution/modules/pom.xml 23(+18 -5)
diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml
index 60286e6..bf5c7c0 100755
--- a/distribution/modules/pom.xml
+++ b/distribution/modules/pom.xml
@@ -19,11 +19,22 @@
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
+ <artifactId>keycloak-dependencies-server-all</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
+ <artifactId>keycloak-core-jaxrs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
<artifactId>keycloak-adapter-core</artifactId>
<version>${project.version}</version>
</dependency>
@@ -53,13 +64,15 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-as7-subsystem</artifactId>
+ <groupId>org.keycloak.subsystem</groupId>
+ <artifactId>keycloak-server</artifactId>
<version>${project.version}</version>
+ <type>war</type>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-as7-subsystem</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
@@ -230,7 +243,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.keycloak</groupId>
+ <groupId>org.keycloak.subsystem</groupId>
<artifactId>keycloak-server</artifactId>
<version>${project.version}</version>
<type>war</type>
diff --git a/distribution/modules/src/main/resources/modules/com/google/zxing/core/main/module.xml b/distribution/modules/src/main/resources/modules/com/google/zxing/core/main/module.xml
new file mode 100755
index 0000000..78a8c49
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/com/google/zxing/core/main/module.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="com.google.zxing.core">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/com/google/zxing/javase/main/module.xml b/distribution/modules/src/main/resources/modules/com/google/zxing/javase/main/module.xml
new file mode 100755
index 0000000..a08a5f9
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/com/google/zxing/javase/main/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="com.google.zxing.javase">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="com.google.zxing.core"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/de/idyl/winzipaes/main/module.xml b/distribution/modules/src/main/resources/modules/de/idyl/winzipaes/main/module.xml
new file mode 100755
index 0000000..7d13910
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/de/idyl/winzipaes/main/module.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="de.idyl.winzipaes">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/net/iharder/base64/main/module.xml b/distribution/modules/src/main/resources/modules/net/iharder/base64/main/module.xml
index 5f39dcf..352ee9c 100755
--- a/distribution/modules/src/main/resources/modules/net/iharder/base64/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/net/iharder/base64/main/module.xml
@@ -1,26 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+
<module xmlns="urn:jboss:module:1.1" name="net.iharder.base64">
<resources>
diff --git a/distribution/modules/src/main/resources/modules/org/freemarker/main/module.xml b/distribution/modules/src/main/resources/modules/org/freemarker/main/module.xml
new file mode 100755
index 0000000..90b6464
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/freemarker/main/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.freemarker">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.log4j"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/jboss/aesh/main/module.xml b/distribution/modules/src/main/resources/modules/org/jboss/aesh/main/module.xml
old mode 100644
new mode 100755
index 5b3cf8d..6fe34f6
--- a/distribution/modules/src/main/resources/modules/org/jboss/aesh/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/jboss/aesh/main/module.xml
@@ -1,26 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+
<module xmlns="urn:jboss:module:1.3" name="org.jboss.aesh">
<properties>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml
new file mode 100755
index 0000000..8432c99
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-account-api">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml
new file mode 100755
index 0000000..1790a85
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-account-freemarker">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-forms-common-freemarker"/>
+ <module name="org.keycloak.keycloak-account-api"/>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-services"/>
+ <module name="org.keycloak.keycloak-social-core"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.freemarker"/>
+ <module name="javax.api"/>
+ <module name="javax.ws.rs.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml
index 2af6613..1fee40c 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml
@@ -1,26 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+
<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-adapter-core">
<resources>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml
index e42ded8..b5c6191 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml
@@ -1,26 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+
<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-as7-adapter">
<resources>
@@ -28,7 +8,7 @@
</resources>
<dependencies>
<module name="javax.api"/>
- <module name="org.bouncycastle"/>
+ <module name="org.bouncycastle" />
<module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.codehaus.jackson.jackson-xc"/>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-subsystem/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-subsystem/main/module.xml
index 3760376..50f4234 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-subsystem/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-subsystem/main/module.xml
@@ -1,26 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+
<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-as7-subsystem">
<resources>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml
new file mode 100755
index 0000000..4d48a6e
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-broker-core">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml
new file mode 100755
index 0000000..e2cac38
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-broker-oidc">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-broker-core"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml
new file mode 100755
index 0000000..f168690
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-broker-saml">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-broker-core"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml
new file mode 100755
index 0000000..d6b86d5
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-connections-infinispan">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.infinispan"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml
new file mode 100755
index 0000000..070b3b0
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-connections-jpa">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <exports>
+ <include path="META-INF/**"/>
+ </exports>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="javax.persistence.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.bouncycastle" />
+ <module name="javax.api"/>
+ <module name="org.hibernate" services="import"/>
+ <module name="org.javassist"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml
new file mode 100755
index 0000000..f52bc84
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-connections-jpa-liquibase">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-connections-jpa"/>
+ <module name="org.liquibase"/>
+ <module name="javax.persistence.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml
new file mode 100755
index 0000000..5f4aa72
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-connections-mongo">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.mongodb.mongo-java-driver"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml
index 095e419..c10c776 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml
@@ -1,26 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+
<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-core">
<resources>
@@ -30,9 +10,10 @@
<module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.codehaus.jackson.jackson-xc"/>
- <module name="org.bouncycastle"/>
+ <module name="org.bouncycastle" />
<module name="net.iharder.base64"/>
<module name="javax.api"/>
+ <module name="javax.activation.api"/>
</dependencies>
</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml
new file mode 100755
index 0000000..6c99976
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-core-jaxrs">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.bouncycastle" />
+ <module name="net.iharder.base64"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml
new file mode 100755
index 0000000..5a9c4f9
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-email-api">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml
new file mode 100755
index 0000000..2300349
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-email-freemarker">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-forms-common-freemarker"/>
+ <module name="org.keycloak.keycloak-email-api"/>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-services"/>
+ <module name="org.keycloak.keycloak-social-core"/>
+ <module name="javax.mail.api"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.freemarker"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml
new file mode 100755
index 0000000..af1ceeb
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-events-api">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml
new file mode 100755
index 0000000..2091165
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-events-email">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.keycloak.keycloak-email-api"/>
+ <module name="javax.mail.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml
new file mode 100755
index 0000000..b786cfc
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-events-jboss-logging">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml
new file mode 100755
index 0000000..f902c4e
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-events-jpa">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.keycloak.keycloak-connections-jpa"/>
+ <module name="javax.persistence.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.javassist"/>
+ <module name="org.hibernate" services="import"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml
new file mode 100755
index 0000000..3e20796
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-events-mongo">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.keycloak.keycloak-connections-mongo"/>
+ <module name="org.mongodb.mongo-java-driver"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml
new file mode 100755
index 0000000..b36c5cb
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-export-import-api">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-model"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="org.jboss.resteasy.resteasy-jaxrs"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.bouncycastle" />
+ <module name="net.iharder.base64"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml
new file mode 100755
index 0000000..db4ee60
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-export-import-dir">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-model"/>
+ <module name="org.keycloak.keycloak-export-import-api"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="org.jboss.resteasy.resteasy-jaxrs"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.bouncycastle" />
+ <module name="net.iharder.base64"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml
new file mode 100755
index 0000000..12dfd46
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-export-import-single-file">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-model"/>
+ <module name="org.keycloak.keycloak-export-import-api"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="org.jboss.resteasy.resteasy-jaxrs"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.bouncycastle" />
+ <module name="net.iharder.base64"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml
new file mode 100755
index 0000000..1351976
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-export-import-zip">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-model"/>
+ <module name="org.keycloak.keycloak-export-import-api"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="org.jboss.resteasy.resteasy-jaxrs"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.bouncycastle" />
+ <module name="net.iharder.base64"/>
+ <module name="de.idyl.winzipaes"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml
new file mode 100755
index 0000000..b3798a3
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-forms-common-freemarker">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.freemarker"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml
new file mode 100755
index 0000000..e9359dc
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-forms-common-themes">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-forms-common-freemarker"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.freemarker"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml
new file mode 100755
index 0000000..45729fe
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-invalidation-cache-infinispan">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-model"/>
+ <module name="org.keycloak.keycloak-connections-infinispan"/>
+ <module name="org.infinispan"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml
new file mode 100755
index 0000000..5e222db
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-invalidation-cache-model">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.resteasy.resteasy-jaxrs"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.bouncycastle" />
+ <module name="net.iharder.base64"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml
index 5ecc097..b84e377 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml
@@ -1,26 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+
<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-jboss-adapter-core">
<resources>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-js-adapter/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-js-adapter/main/module.xml
new file mode 100755
index 0000000..5a2fdf0
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-js-adapter/main/module.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-js-adapter">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml
new file mode 100755
index 0000000..5c81548
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-ldap-federation">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-picketlink-api"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.resteasy.resteasy-jaxrs"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.picketlink.common"/>
+ <module name="org.picketlink.idm.api"/>
+ <module name="org.picketlink.idm"/>
+ <module name="org.picketlink.idm.schema"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml
new file mode 100755
index 0000000..8fcd75c
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-login-api">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml
new file mode 100755
index 0000000..e7b2d35
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-login-freemarker">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-forms-common-freemarker"/>
+ <module name="org.keycloak.keycloak-login-api"/>
+ <module name="org.keycloak.keycloak-email-api"/>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-services"/>
+ <module name="org.keycloak.keycloak-social-core"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.freemarker"/>
+ <module name="javax.api"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.resteasy.resteasy-jaxrs"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml
new file mode 100755
index 0000000..30ce763
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-model-api">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.jboss.logging"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.bouncycastle" />
+ <module name="net.iharder.base64"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml
new file mode 100755
index 0000000..5603e02
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-model-jpa">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-connections-jpa" services="import"/>
+ <module name="javax.persistence.api"/>
+ <module name="net.iharder.base64"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.javassist"/>
+ <module name="org.hibernate" services="import"/>
+ <module name="org.bouncycastle" />
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml
new file mode 100755
index 0000000..2017d49
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-model-mongo">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-connections-mongo"/>
+ <module name="org.mongodb.mongo-java-driver"/>
+ <module name="net.iharder.base64"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml
new file mode 100755
index 0000000..b17720e
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-model-sessions-infinispan">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-connections-infinispan"/>
+ <module name="org.infinispan"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-jpa/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-jpa/main/module.xml
new file mode 100755
index 0000000..b26bce7
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-jpa/main/module.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-model-sessions-jpa">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-connections-jpa"/>
+ <module name="javax.persistence.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ <module name="org.javassist"/>
+ <module name="org.hibernate" services="import"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mem/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mem/main/module.xml
new file mode 100755
index 0000000..6e6b347
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mem/main/module.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-model-sessions-mem">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mongo/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mongo/main/module.xml
new file mode 100755
index 0000000..8e56207
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-mongo/main/module.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-model-sessions-mongo">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-connections-mongo"/>
+ <module name="org.mongodb.mongo-java-driver"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-picketlink-api/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-picketlink-api/main/module.xml
new file mode 100755
index 0000000..b51112b
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-picketlink-api/main/module.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-picketlink-api">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-picketlink-api"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.picketlink.common"/>
+ <module name="org.picketlink.idm.api"/>
+ <module name="org.picketlink.idm"/>
+ <module name="org.picketlink.idm.schema"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-picketlink-ldap/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-picketlink-ldap/main/module.xml
new file mode 100755
index 0000000..429188f
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-picketlink-ldap/main/module.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-picketlink-ldap">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-picketlink-api"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.picketlink.common"/>
+ <module name="org.picketlink.idm.api"/>
+ <module name="org.picketlink.idm"/>
+ <module name="org.picketlink.idm.schema"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml
new file mode 100755
index 0000000..44f4d75
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-saml-protocol">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-events-api"/>
+ <module name="org.keycloak.keycloak-account-api"/>
+ <module name="org.keycloak.keycloak-email-api"/>
+ <module name="org.keycloak.keycloak-login-api"/>
+ <module name="org.keycloak.keycloak-services"/>
+ <module name="org.keycloak.keycloak-forms-common-freemarker"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.picketlink.common"/>
+ <module name="org.picketlink.federation"/>
+
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.resteasy.resteasy-jaxrs"/>
+ <module name="org.jboss.resteasy.resteasy-crypto"/>
+ <module name="org.jboss.resteasy.resteasy-multipart-provider"/>
+
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-server/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-server/main/module.xml
new file mode 100755
index 0000000..a2efd4a
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-server/main/module.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-server">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-account-api" services="import"/>
+ <module name="org.keycloak.keycloak-account-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-adapter-core" services="import"/>
+ <module name="org.keycloak.keycloak-as7-adapter" services="import"/>
+ <module name="org.keycloak.keycloak-as7-subsystem" services="import"/>
+ <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
+ <module name="org.keycloak.keycloak-connections-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
+ <module name="org.keycloak.keycloak-connections-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-core" services="import"/>
+ <module name="org.keycloak.keycloak-core-jaxrs" services="import"/>
+ <module name="org.keycloak.keycloak-email-api" services="import"/>
+ <module name="org.keycloak.keycloak-email-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-events-api" services="import"/>
+ <module name="org.keycloak.keycloak-events-email" services="import"/>
+ <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
+ <module name="org.keycloak.keycloak-events-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-events-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-api" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-zip" services="import"/>
+ <module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-model" services="import"/>
+ <module name="org.keycloak.keycloak-jboss-adapter-core" services="import"/>
+ <module name="org.keycloak.keycloak-js-adapter" services="import"/>
+ <module name="org.keycloak.keycloak-ldap-federation" services="import"/>
+ <module name="org.keycloak.keycloak-login-api" services="import"/>
+ <module name="org.keycloak.keycloak-login-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-model-api" services="import"/>
+ <module name="org.keycloak.keycloak-model-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-model-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-mem" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-picketlink-api" services="import"/>
+ <module name="org.keycloak.keycloak-picketlink-ldap" services="import"/>
+ <module name="org.keycloak.keycloak-saml-protocol" services="import"/>
+ <module name="org.keycloak.keycloak-services" export="true" services="import"/>
+ <module name="org.keycloak.keycloak-social-core" services="import"/>
+ <module name="org.keycloak.keycloak-social-facebook" services="import"/>
+ <module name="org.keycloak.keycloak-social-github" services="import"/>
+ <module name="org.keycloak.keycloak-social-google" services="import"/>
+ <module name="org.keycloak.keycloak-social-twitter" services="import"/>
+ <module name="org.keycloak.keycloak-subsystem" services="import"/>
+ <module name="org.keycloak.keycloak-timer-api" services="import"/>
+ <module name="org.keycloak.keycloak-timer-basic" services="import"/>
+ <module name="org.keycloak.keycloak-undertow-adapter" services="import"/>
+ <module name="org.keycloak.keycloak-wildfly-adapter" services="import"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml
new file mode 100755
index 0000000..e98c558
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-services">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-account-api" services="import"/>
+ <module name="org.keycloak.keycloak-account-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-broker-core" services="import"/>
+ <module name="org.keycloak.keycloak-broker-oidc" services="import"/>
+ <module name="org.keycloak.keycloak-broker-saml" services="import"/>
+ <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
+ <module name="org.keycloak.keycloak-connections-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
+ <module name="org.keycloak.keycloak-connections-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-core" services="import"/>
+ <module name="org.keycloak.keycloak-core-jaxrs" services="import"/>
+ <module name="org.keycloak.keycloak-email-api" services="import"/>
+ <module name="org.keycloak.keycloak-email-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-events-api" services="import"/>
+ <module name="org.keycloak.keycloak-events-email" services="import"/>
+ <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
+ <module name="org.keycloak.keycloak-events-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-events-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-api" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-zip" services="import"/>
+ <module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-model" services="import"/>
+ <module name="org.keycloak.keycloak-jboss-adapter-core" services="import"/>
+ <module name="org.keycloak.keycloak-js-adapter" services="import"/>
+ <module name="org.keycloak.keycloak-ldap-federation" services="import"/>
+ <module name="org.keycloak.keycloak-login-api" services="import"/>
+ <module name="org.keycloak.keycloak-login-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-model-api" services="import"/>
+ <module name="org.keycloak.keycloak-model-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-model-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-mem" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-picketlink-api" services="import"/>
+
+ <module name="org.keycloak.keycloak-picketlink-ldap" services="import"/>
+ <module name="org.keycloak.keycloak-saml-protocol" services="import"/>
+ <module name="org.keycloak.keycloak-services" export="true" services="import"/>
+ <module name="org.keycloak.keycloak-social-core" services="import"/>
+ <module name="org.keycloak.keycloak-social-facebook" services="import"/>
+ <module name="org.keycloak.keycloak-social-github" services="import"/>
+ <module name="org.keycloak.keycloak-social-google" services="import"/>
+ <module name="org.keycloak.keycloak-social-twitter" services="import"/>
+ <module name="org.keycloak.keycloak-timer-api" services="import"/>
+ <module name="org.keycloak.keycloak-timer-basic" services="import"/>
+
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.resteasy.resteasy-jaxrs"/>
+ <module name="org.jboss.resteasy.resteasy-crypto"/>
+ <module name="org.jboss.resteasy.resteasy-multipart-provider"/>
+ <module name="javax.servlet.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="com.google.zxing.core"/>
+ <module name="com.google.zxing.javase"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.bouncycastle" />
+ <module name="net.iharder.base64"/>
+ <module name="javax.api"/>
+ <module name="javax.activation.api"/>
+ <module name="org.apache.httpcomponents"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml
new file mode 100755
index 0000000..76b344d
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-social-core">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-broker-core"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="javax.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml
new file mode 100755
index 0000000..a3db93e
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-social-facebook">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-social-core"/>
+ <module name="org.keycloak.keycloak-broker-core"/>
+ <module name="org.keycloak.keycloak-broker-oidc"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml
new file mode 100755
index 0000000..ad22239
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-social-github">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-social-core"/>
+ <module name="org.keycloak.keycloak-broker-core"/>
+ <module name="org.keycloak.keycloak-broker-oidc"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml
new file mode 100755
index 0000000..e1ba05b
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-social-google">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-social-core"/>
+ <module name="org.keycloak.keycloak-broker-core"/>
+ <module name="org.keycloak.keycloak-broker-oidc"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml
new file mode 100755
index 0000000..3f67efe
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-social-twitter">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-social-core"/>
+ <module name="org.keycloak.keycloak-broker-core"/>
+ <module name="org.keycloak.keycloak-broker-oidc"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.twitter4j"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml
new file mode 100755
index 0000000..0140db4
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-timer-api">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml
new file mode 100755
index 0000000..6147e17
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-timer-basic">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-timer-api"/>
+ <module name="org.keycloak.keycloak-model-api"/>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml
index 9d19d40..8059df1 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml
@@ -1,26 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+
<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-undertow-adapter">
<resources>
@@ -28,7 +8,7 @@
</resources>
<dependencies>
<module name="javax.api"/>
- <module name="org.bouncycastle"/>
+ <module name="org.bouncycastle" />
<module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.codehaus.jackson.jackson-xc"/>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml
index a89bac4..4402e8a 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml
@@ -1,26 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+
<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-wildfly-adapter">
<resources>
@@ -28,7 +8,7 @@
</resources>
<dependencies>
<module name="javax.api"/>
- <module name="org.bouncycastle"/>
+ <module name="org.bouncycastle" />
<module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.codehaus.jackson.jackson-xc"/>
diff --git a/distribution/modules/src/main/resources/modules/org/liquibase/main/module.xml b/distribution/modules/src/main/resources/modules/org/liquibase/main/module.xml
new file mode 100755
index 0000000..23826c4
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/liquibase/main/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.liquibase">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="org.apache.commons.logging"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml b/distribution/modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml
new file mode 100755
index 0000000..d07ac5d
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.mongodb.mongo-java-driver">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/distribution/modules/src/main/resources/modules/org/twitter4j/main/module.xml b/distribution/modules/src/main/resources/modules/org/twitter4j/main/module.xml
new file mode 100755
index 0000000..887a044
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/twitter4j/main/module.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.twitter4j">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+ <dependencies>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
distribution/pom.xml 1(+1 -0)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index f728364..dd6a947 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -25,6 +25,7 @@
</plugins>
</build>
<modules>
+ <module>subsystem-war</module>
<module>modules</module>
<module>as7-adapter-zip</module>
<module>tomcat6-adapter-zip</module>
distribution/subsystem-war/pom.xml 40(+40 -0)
diff --git a/distribution/subsystem-war/pom.xml b/distribution/subsystem-war/pom.xml
new file mode 100755
index 0000000..18b0dfd
--- /dev/null
+++ b/distribution/subsystem-war/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>keycloak-parent</artifactId>
+ <groupId>org.keycloak</groupId>
+ <version>1.2.0.Beta1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.keycloak.subsystem</groupId>
+ <artifactId>keycloak-server</artifactId>
+ <packaging>war</packaging>
+ <name>Keycloak Subsystem Server WAR</name>
+ <description/>
+
+ <dependencies>
+ </dependencies>
+
+ <build>
+ <finalName>auth-server</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.as.plugins</groupId>
+ <artifactId>jboss-as-maven-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/distribution/subsystem-war/src/main/resources/META-INF/keycloak-server.json b/distribution/subsystem-war/src/main/resources/META-INF/keycloak-server.json
new file mode 100755
index 0000000..9f0d03e
--- /dev/null
+++ b/distribution/subsystem-war/src/main/resources/META-INF/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/subsystem-war/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/distribution/subsystem-war/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
new file mode 100755
index 0000000..356b953
--- /dev/null
+++ b/distribution/subsystem-war/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,71 @@
+<jboss-deployment-structure>
+ <deployment>
+ <dependencies>
+ <module name="org.keycloak.keycloak-account-api" services="import"/>
+ <module name="org.keycloak.keycloak-account-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
+ <module name="org.keycloak.keycloak-connections-jpa" services="import" meta-inf="import"/>
+ <module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
+ <module name="org.keycloak.keycloak-connections-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-core" services="import"/>
+ <module name="org.keycloak.keycloak-core-jaxrs" services="import"/>
+ <module name="org.keycloak.keycloak-email-api" services="import"/>
+ <module name="org.keycloak.keycloak-email-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-events-api" services="import"/>
+ <module name="org.keycloak.keycloak-events-email" services="import"/>
+ <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
+ <module name="org.keycloak.keycloak-events-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-events-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-api" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
+ <module name="org.keycloak.keycloak-export-import-zip" services="import"/>
+ <module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>
+ <module name="org.keycloak.keycloak-invalidation-cache-model" services="import"/>
+ <module name="org.keycloak.keycloak-jboss-adapter-core" services="import"/>
+ <module name="org.keycloak.keycloak-js-adapter" services="import"/>
+ <module name="org.keycloak.keycloak-ldap-federation" services="import"/>
+ <module name="org.keycloak.keycloak-login-api" services="import"/>
+ <module name="org.keycloak.keycloak-login-freemarker" services="import"/>
+ <module name="org.keycloak.keycloak-model-api" services="import"/>
+ <module name="org.keycloak.keycloak-model-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-model-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-jpa" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-mem" services="import"/>
+ <module name="org.keycloak.keycloak-model-sessions-mongo" services="import"/>
+ <module name="org.keycloak.keycloak-picketlink-api" services="import"/>
+
+ <module name="org.keycloak.keycloak-picketlink-ldap" services="import"/>
+ <module name="org.keycloak.keycloak-saml-protocol" services="import"/>
+ <module name="org.keycloak.keycloak-services" export="true" services="import"/>
+ <module name="org.keycloak.keycloak-social-core" services="import"/>
+ <module name="org.keycloak.keycloak-social-facebook" services="import"/>
+ <module name="org.keycloak.keycloak-social-github" services="import"/>
+ <module name="org.keycloak.keycloak-social-google" services="import"/>
+ <module name="org.keycloak.keycloak-social-twitter" services="import"/>
+ <module name="org.keycloak.keycloak-timer-api" services="import"/>
+ <module name="org.keycloak.keycloak-timer-basic" services="import"/>
+ <module name="org.hibernate" services="import"/>
+ <module name="org.bouncycastle"/>
+
+ <module name="org.jboss.resteasy.resteasy-jackson-provider" services="import"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ </dependencies>
+ <exclusions>
+ <module name="org.jboss.resteasy.resteasy-jackson2-provider"/>
+
+ <!-- Exclude keycloak modules -->
+ <module name="org.keycloak.keycloak-core" />
+ <module name="org.keycloak.keycloak-adapter-core" />
+ <module name="org.keycloak.keycloak-undertow-adapter" />
+ <module name="org.keycloak.keycloak-as7-adapter" />
+ </exclusions>
+ <exclude-subsystems>
+ <subsystem name="webservices"/>
+ </exclude-subsystems>
+ </deployment>
+</jboss-deployment-structure>
\ No newline at end of file
diff --git a/distribution/subsystem-war/src/main/webapp/WEB-INF/web.xml b/distribution/subsystem-war/src/main/webapp/WEB-INF/web.xml
new file mode 100755
index 0000000..7228afe
--- /dev/null
+++ b/distribution/subsystem-war/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
+
+ <module-name>auth</module-name>
+
+ <servlet>
+ <servlet-name>Keycloak REST Interface</servlet-name>
+ <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServlet30Dispatcher</servlet-class>
+ <init-param>
+ <param-name>javax.ws.rs.Application</param-name>
+ <param-value>org.keycloak.services.resources.KeycloakApplication</param-value>
+ </init-param>
+ <init-param>
+ <param-name>resteasy.servlet.mapping.prefix</param-name>
+ <param-value>/</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ <async-supported>true</async-supported>
+ </servlet>
+
+ <listener>
+ <listener-class>org.keycloak.services.listeners.KeycloakSessionDestroyListener</listener-class>
+ </listener>
+
+ <filter>
+ <filter-name>Keycloak Client Connection Filter</filter-name>
+ <filter-class>org.keycloak.services.filters.ClientConnectionFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>Keycloak Session Management</filter-name>
+ <filter-class>org.keycloak.services.filters.KeycloakSessionServletFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Keycloak Session Management</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>Keycloak Client Connection Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Keycloak REST Interface</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
forms/login-freemarker/pom.xml 11(+5 -6)
diff --git a/forms/login-freemarker/pom.xml b/forms/login-freemarker/pom.xml
index 637ba88..944157c 100755
--- a/forms/login-freemarker/pom.xml
+++ b/forms/login-freemarker/pom.xml
@@ -62,14 +62,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>3.2.2.Final</version>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
index 13dbe25..7b4c1c9 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
@@ -24,9 +24,8 @@ import org.keycloak.services.managers.ApplicationManager;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.resources.KeycloakApplication;
+import org.keycloak.util.MimeTypeUtil;
-import javax.activation.FileTypeMap;
-import javax.activation.MimetypesFileTypeMap;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@@ -260,8 +259,6 @@ public class AdminConsole {
return realmManager.getKeycloakAdminstrationRealm();
}
- private static FileTypeMap mimeTypes = MimetypesFileTypeMap.getDefaultFileTypeMap();
-
/**
* Main page of this realm's admin console
*
@@ -319,7 +316,7 @@ public class AdminConsole {
Theme theme = themeProvider.getTheme(realm.getAdminTheme(), Theme.Type.ADMIN);
InputStream resource = theme.getResourceAsStream(path);
if (resource != null) {
- String contentType = mimeTypes.getContentType(path);
+ String contentType = MimeTypeUtil.getContentType(path);
CacheControl cacheControl = new CacheControl();
cacheControl.setNoTransform(false);
diff --git a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java
index 19ddaec..2021ed8 100755
--- a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java
@@ -5,9 +5,8 @@ import org.keycloak.Config;
import org.keycloak.freemarker.Theme;
import org.keycloak.freemarker.ThemeProvider;
import org.keycloak.models.KeycloakSession;
+import org.keycloak.util.MimeTypeUtil;
-import javax.activation.FileTypeMap;
-import javax.activation.MimetypesFileTypeMap;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@@ -26,8 +25,6 @@ public class ThemeResource {
private static final Logger logger = Logger.getLogger(ThemeResource.class);
- private static FileTypeMap mimeTypes = MimetypesFileTypeMap.getDefaultFileTypeMap();
-
@Context
private KeycloakSession session;
@@ -51,7 +48,7 @@ public class ThemeResource {
cacheControl.setNoTransform(false);
cacheControl.setMaxAge(Config.scope("theme").getInt("staticMaxAge", -1));
- return Response.ok(resource).type(mimeTypes.getContentType(path)).cacheControl(cacheControl).build();
+ return Response.ok(resource).type(MimeTypeUtil.getContentType(path)).cacheControl(cacheControl).build();
} else {
return Response.status(Response.Status.NOT_FOUND).build();
}
diff --git a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java
index f0f9b50..3feacf1 100755
--- a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java
@@ -5,9 +5,8 @@ import org.keycloak.Config;
import org.keycloak.freemarker.Theme;
import org.keycloak.freemarker.ThemeProvider;
import org.keycloak.models.KeycloakSession;
+import org.keycloak.util.MimeTypeUtil;
-import javax.activation.FileTypeMap;
-import javax.activation.MimetypesFileTypeMap;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@@ -28,8 +27,6 @@ public class WelcomeResource {
private static final Logger logger = Logger.getLogger(WelcomeResource.class);
- private static FileTypeMap mimeTypes = MimetypesFileTypeMap.getDefaultFileTypeMap();
-
@Context
private UriInfo uriInfo;
@@ -70,7 +67,7 @@ public class WelcomeResource {
Theme theme = themeProvider.getTheme(config.get("welcomeTheme"), Theme.Type.WELCOME);
InputStream resource = theme.getResourceAsStream(path);
if (resource != null) {
- String contentType = mimeTypes.getContentType(path);
+ String contentType = MimeTypeUtil.getContentType(path);
CacheControl cacheControl = new CacheControl();
cacheControl.setNoTransform(false);