From 75343986b0d22d5da8ac172fc96a95e2399ecc45 Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Thu, 1 Oct 2015 14:27:51 -0400 Subject: [PATCH] keycloak-common --- common/pom.xml | 94 +++++++++++++++++++ .../java/org/keycloak/ClientConnection.java | 0 .../org/keycloak/VerificationException.java | 0 .../src/main/java/org/keycloak/Version.java | 37 ++++++++ .../keycloak/constants/GenericConstants.java | 0 .../keycloak/constants/KerberosConstants.java | 0 .../constants/ServiceAccountConstants.java | 0 .../org/keycloak/enums/RelativeUrlsUsed.java | 0 .../java/org/keycloak/enums/SslRequired.java | 0 .../main/java/org/keycloak/util/Base64.java | 0 .../java/org/keycloak/util/Base64Url.java | 0 .../org/keycloak/util/BouncyIntegration.java | 0 .../org/keycloak/util/CertificateUtils.java | 0 .../org/keycloak/util/CollectionUtil.java | 0 .../main/java/org/keycloak/util/DerUtils.java | 0 .../main/java/org/keycloak/util/Encode.java | 0 .../main/java/org/keycloak/util/EnvUtil.java | 0 .../main/java/org/keycloak/util/FindFile.java | 0 .../java/org/keycloak/util/HostUtils.java | 0 .../java/org/keycloak/util/HtmlUtils.java | 0 .../util/KerberosSerializationUtils.java | 0 .../org/keycloak/util/KeycloakUriBuilder.java | 0 .../java/org/keycloak/util/KeystoreUtil.java | 0 .../java/org/keycloak/util/MimeTypeUtil.java | 0 .../org/keycloak/util/MultivaluedHashMap.java | 0 .../java/org/keycloak/util/NetworkUtils.java | 0 .../java/org/keycloak/util/ObjectUtil.java | 0 .../java/org/keycloak/util/PathHelper.java | 0 .../main/java/org/keycloak/util/PemUtils.java | 0 .../java/org/keycloak/util/ServerCookie.java | 0 .../java/org/keycloak/util/StreamUtil.java | 0 .../keycloak/util/StringPropertyReplacer.java | 0 .../keycloak/util/SystemEnvProperties.java | 0 .../src/main/java/org/keycloak/util/Time.java | 0 .../main/java/org/keycloak/util/UriUtils.java | 0 .../util/reflections/Reflections.java | 0 .../SetAccessiblePrivilegedAction.java | 0 .../org/keycloak/util/reflections/Types.java | 0 .../resources/keycloak-version.properties | 0 core/pom.xml | 4 + core/src/main/java/org/keycloak/Version.java | 52 ---------- .../VersionRepresentation.java | 29 ++++++ dependencies/server-min/pom.xml | 4 + .../as7-adapter-zip/assembly.xml | 1 + .../as7-eap6-adapter/as7-modules/build.xml | 3 + .../as7-eap6-adapter/as7-modules/pom.xml | 4 + .../keycloak-adapter-core/main/module.xml | 1 + .../keycloak-adapter-spi/main/module.xml | 2 +- .../keycloak-as7-adapter/main/module.xml | 1 + .../keycloak/keycloak-common}/main/module.xml | 5 +- .../keycloak/keycloak-core/main/module.xml | 1 + .../main/module.xml | 2 +- .../main/module.xml | 1 + .../eap6-adapter-zip/assembly.xml | 1 + .../features/src/main/resources/features.xml | 1 + .../wf8-adapter/wf8-adapter-zip/assembly.xml | 1 + .../wf8-adapter/wf8-modules/build.xml | 4 + .../adapters/wf8-adapter/wf8-modules/pom.xml | 4 + .../keycloak-adapter-core/main/module.xml | 1 + .../keycloak-adapter-spi/main/module.xml | 2 +- .../keycloak/keycloak-common/main/module.xml | 17 ++++ .../keycloak/keycloak-core/main/module.xml | 1 + .../main/module.xml | 3 +- .../main/module.xml | 1 + .../keycloak-undertow-adapter/main/module.xml | 1 + .../keycloak-wildfly-adapter/main/module.xml | 1 + .../wf9-adapter/wf9-adapter-zip/assembly.xml | 1 + .../wf9-adapter/wf9-modules/build.xml | 4 + .../adapters/wf9-adapter/wf9-modules/pom.xml | 4 + .../keycloak-adapter-core/main/module.xml | 1 + .../keycloak-adapter-spi/main/module.xml | 2 +- .../keycloak/keycloak-common/main/module.xml | 17 ++++ .../keycloak/keycloak-core/main/module.xml | 1 + .../main/module.xml | 3 +- .../main/module.xml | 1 + .../keycloak-undertow-adapter/main/module.xml | 1 + .../keycloak-wildfly-adapter/main/module.xml | 1 + .../keycloak-adapter-core/main/module.xml | 1 + .../keycloak-adapter-spi/main/module.xml | 2 +- .../keycloak/keycloak-common/main/module.xml | 17 ++++ .../keycloak/keycloak-core/main/module.xml | 1 + .../main/module.xml | 3 +- .../main/module.xml | 1 + .../keycloak-undertow-adapter/main/module.xml | 1 + .../keycloak-wildfly-adapter/main/module.xml | 1 + .../keycloak-account-api/main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-broker-core/main/module.xml | 1 + .../keycloak-broker-oidc/main/module.xml | 1 + .../keycloak-broker-saml/main/module.xml | 1 + .../keycloak/keycloak-common/main/module.xml | 17 ++++ .../keycloak-connections-file/main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-connections-jpa/main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-core-jaxrs/main/module.xml | 1 + .../keycloak/keycloak-core/main/module.xml | 1 + .../keycloak-email-api/main/module.xml | 1 + .../keycloak-email-freemarker/main/module.xml | 1 + .../keycloak-events-api/main/module.xml | 1 + .../keycloak-events-email/main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-events-jpa/main/module.xml | 1 + .../keycloak-events-mongo/main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-ldap-federation/main/module.xml | 1 + .../keycloak-login-api/main/module.xml | 1 + .../keycloak-login-freemarker/main/module.xml | 1 + .../keycloak-model-api/main/module.xml | 1 + .../keycloak-model-file/main/module.xml | 1 + .../keycloak-model-jpa/main/module.xml | 1 + .../keycloak-model-mongo/main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-saml-core/main/module.xml | 1 + .../keycloak-saml-protocol/main/module.xml | 1 + .../WEB-INF/jboss-deployment-structure.xml | 2 + .../keycloak-services/main/module.xml | 1 + .../keycloak-social-core/main/module.xml | 1 + .../keycloak-social-facebook/main/module.xml | 1 + .../keycloak-social-github/main/module.xml | 1 + .../keycloak-social-google/main/module.xml | 1 + .../keycloak-social-linkedin/main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-social-twitter/main/module.xml | 1 + .../keycloak-timer-api/main/module.xml | 1 + .../keycloak-timer-basic/main/module.xml | 1 + .../main/module.xml | 1 + .../wf9-adapter/wf9-adapter-zip/assembly.xml | 2 +- .../wf9-adapter/wf9-modules/build.xml | 5 +- .../wf9-adapter/wf9-modules/pom.xml | 2 +- .../keycloak-adapter-spi/main/module.xml | 2 +- .../keycloak/keycloak-common/main/module.xml | 17 ++++ .../main/module.xml | 3 +- .../main/module.xml | 2 +- .../keycloak-saml-core/main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../eap6/eap6-server-modules/build.xml | 4 + .../eap6/eap6-server-modules/pom.xml | 4 + .../keycloak-account-api/main/module.xml | 1 + .../main/module.xml | 1 + .../WEB-INF/jboss-deployment-structure.xml | 2 + .../keycloak-broker-core/main/module.xml | 1 + .../keycloak-broker-oidc/main/module.xml | 1 + .../keycloak-broker-saml/main/module.xml | 1 + .../keycloak/keycloak-common/main/module.xml | 17 ++++ .../keycloak-connections-file/main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-connections-jpa/main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-core-jaxrs/main/module.xml | 1 + .../keycloak/keycloak-core/main/module.xml | 1 + .../keycloak-email-api/main/module.xml | 1 + .../keycloak-email-freemarker/main/module.xml | 1 + .../keycloak-events-api/main/module.xml | 1 + .../keycloak-events-email/main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-events-jpa/main/module.xml | 1 + .../keycloak-events-mongo/main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-ldap-federation/main/module.xml | 1 + .../keycloak-login-api/main/module.xml | 1 + .../keycloak-login-freemarker/main/module.xml | 1 + .../keycloak-model-api/main/module.xml | 1 + .../keycloak-model-file/main/module.xml | 1 + .../keycloak-model-jpa/main/module.xml | 1 + .../keycloak-model-mongo/main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-saml-core/main/module.xml | 2 +- .../keycloak-saml-protocol/main/module.xml | 1 + .../keycloak-services/main/module.xml | 1 + .../keycloak-social-core/main/module.xml | 1 + .../keycloak-social-facebook/main/module.xml | 1 + .../keycloak-social-github/main/module.xml | 1 + .../keycloak-social-google/main/module.xml | 1 + .../keycloak-social-linkedin/main/module.xml | 1 + .../main/module.xml | 1 + .../keycloak-social-twitter/main/module.xml | 1 + .../keycloak-timer-api/main/module.xml | 1 + .../keycloak-timer-basic/main/module.xml | 1 + .../main/module.xml | 1 + examples/saml/post-with-encryption/README.md | 5 +- examples/saml/post-with-signature/README.md | 6 +- .../saml/redirect-with-signature/README.md | 5 + .../util/MultipleStepsExportProvider.java | 8 +- .../exportimport/dir/DirExportProvider.java | 4 +- .../exportimport/zip/ZipExportProvider.java | 4 +- .../adapters/PreAuthActionsHandler.java | 4 +- .../as7/KeycloakDependencyProcessor.java | 2 + integration/jboss-adapter-core/pom.xml | 2 +- integration/jetty/jetty-adapter-spi/pom.xml | 2 +- integration/tomcat/tomcat-adapter-spi/pom.xml | 2 +- integration/undertow-adapter-spi/pom.xml | 2 +- .../KeycloakDependencyProcessor.java | 2 + .../KeycloakDependencyProcessor.java | 2 + pom.xml | 6 ++ saml/client-adapter/core/pom.xml | 2 +- .../adapters/saml/AdapterConstants.java | 9 ++ .../saml/jetty/AbstractSamlAuthenticator.java | 2 +- saml/client-adapter/jetty/jetty8.1/pom.xml | 2 +- saml/client-adapter/jetty/jetty9.1/pom.xml | 2 +- saml/client-adapter/jetty/jetty9.2/pom.xml | 2 +- .../client-adapter/tomcat/tomcat-core/pom.xml | 2 +- .../saml/AbstractSamlAuthenticatorValve.java | 2 - saml/client-adapter/undertow/pom.xml | 2 +- .../wildfly/wildfly-adapter/pom.xml | 2 +- .../KeycloakDependencyProcessor.java | 2 + saml/saml-core/pom.xml | 2 +- saml/saml-protocol/pom.xml | 2 +- .../resources/ServerVersionResource.java | 7 +- .../admin/info/SystemInfoRepresentation.java | 0 .../adapter/AdapterTestStrategy.java | 18 +--- 234 files changed, 517 insertions(+), 127 deletions(-) create mode 100755 common/pom.xml rename {core => common}/src/main/java/org/keycloak/ClientConnection.java (100%) rename {core => common}/src/main/java/org/keycloak/VerificationException.java (100%) create mode 100755 common/src/main/java/org/keycloak/Version.java rename {core => common}/src/main/java/org/keycloak/constants/GenericConstants.java (100%) rename {core => common}/src/main/java/org/keycloak/constants/KerberosConstants.java (100%) rename {core => common}/src/main/java/org/keycloak/constants/ServiceAccountConstants.java (100%) rename {core => common}/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java (100%) rename {core => common}/src/main/java/org/keycloak/enums/SslRequired.java (100%) rename {core => common}/src/main/java/org/keycloak/util/Base64.java (100%) rename {core => common}/src/main/java/org/keycloak/util/Base64Url.java (100%) rename {core => common}/src/main/java/org/keycloak/util/BouncyIntegration.java (100%) rename {core => common}/src/main/java/org/keycloak/util/CertificateUtils.java (100%) rename {core => common}/src/main/java/org/keycloak/util/CollectionUtil.java (100%) rename {core => common}/src/main/java/org/keycloak/util/DerUtils.java (100%) rename {core => common}/src/main/java/org/keycloak/util/Encode.java (100%) rename {core => common}/src/main/java/org/keycloak/util/EnvUtil.java (100%) rename {core => common}/src/main/java/org/keycloak/util/FindFile.java (100%) rename {core => common}/src/main/java/org/keycloak/util/HostUtils.java (100%) rename {core => common}/src/main/java/org/keycloak/util/HtmlUtils.java (100%) rename {core => common}/src/main/java/org/keycloak/util/KerberosSerializationUtils.java (100%) rename {core => common}/src/main/java/org/keycloak/util/KeycloakUriBuilder.java (100%) rename {core => common}/src/main/java/org/keycloak/util/KeystoreUtil.java (100%) rename {core => common}/src/main/java/org/keycloak/util/MimeTypeUtil.java (100%) rename {core => common}/src/main/java/org/keycloak/util/MultivaluedHashMap.java (100%) rename {core => common}/src/main/java/org/keycloak/util/NetworkUtils.java (100%) rename {core => common}/src/main/java/org/keycloak/util/ObjectUtil.java (100%) rename {core => common}/src/main/java/org/keycloak/util/PathHelper.java (100%) rename {core => common}/src/main/java/org/keycloak/util/PemUtils.java (100%) rename {core => common}/src/main/java/org/keycloak/util/ServerCookie.java (100%) rename {core => common}/src/main/java/org/keycloak/util/StreamUtil.java (100%) rename {core => common}/src/main/java/org/keycloak/util/StringPropertyReplacer.java (100%) rename {core => common}/src/main/java/org/keycloak/util/SystemEnvProperties.java (100%) rename {core => common}/src/main/java/org/keycloak/util/Time.java (100%) rename {core => common}/src/main/java/org/keycloak/util/UriUtils.java (100%) rename {core => common}/src/main/java/org/keycloak/util/reflections/Reflections.java (100%) rename {core => common}/src/main/java/org/keycloak/util/reflections/SetAccessiblePrivilegedAction.java (100%) rename {core => common}/src/main/java/org/keycloak/util/reflections/Types.java (100%) rename {core => common}/src/main/resources/keycloak-version.properties (100%) delete mode 100755 core/src/main/java/org/keycloak/Version.java create mode 100755 core/src/main/java/org/keycloak/representations/VersionRepresentation.java rename distribution/{saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-core => adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-common}/main/module.xml (70%) mode change 100644 => 100755 distribution/adapters/osgi/features/src/main/resources/features.xml create mode 100755 distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml create mode 100755 distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml create mode 100755 distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-common/main/module.xml mode change 100644 => 100755 distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml create mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-common/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-file/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-infinispan/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core-jaxrs/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-zip/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-themes/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-ldap-federation/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-api/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-file/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-core/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-facebook/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-github/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-google/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-linkedin/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-stackoverflow/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-twitter/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml mode change 100644 => 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-extensions/main/module.xml create mode 100755 distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml create mode 100755 distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml mode change 100644 => 100755 distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-file/main/module.xml mode change 100644 => 100755 distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml mode change 100644 => 100755 distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-kerberos-federation/main/module.xml mode change 100644 => 100755 distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-extensions/main/module.xml create mode 100755 saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/AdapterConstants.java mode change 100644 => 100755 services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java diff --git a/common/pom.xml b/common/pom.xml new file mode 100755 index 000000000000..3d9cb48ae683 --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,94 @@ + + + + keycloak-parent + org.keycloak + 1.6.0.Final-SNAPSHOT + ../pom.xml + + 4.0.0 + + keycloak-common + Keycloak Common + jar + Common library and dependencies shared with server and all adapters + + + ${maven.build.timestamp} + yyyy-MM-dd HH:mm + + org.keycloak.* + + + *;resolution:=optional + + + + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + + + junit + junit + test + + + + + + src/main/resources + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + + + + + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.felix + maven-bundle-plugin + true + + + bundle-manifest + process-classes + + manifest + + + + + + . + ${project.name} + ${project.groupId}.${project.artifactId} + ${keycloak.osgi.import} + ${keycloak.osgi.export} + + + + + + + diff --git a/core/src/main/java/org/keycloak/ClientConnection.java b/common/src/main/java/org/keycloak/ClientConnection.java similarity index 100% rename from core/src/main/java/org/keycloak/ClientConnection.java rename to common/src/main/java/org/keycloak/ClientConnection.java diff --git a/core/src/main/java/org/keycloak/VerificationException.java b/common/src/main/java/org/keycloak/VerificationException.java similarity index 100% rename from core/src/main/java/org/keycloak/VerificationException.java rename to common/src/main/java/org/keycloak/VerificationException.java diff --git a/common/src/main/java/org/keycloak/Version.java b/common/src/main/java/org/keycloak/Version.java new file mode 100755 index 000000000000..65096b24ecaf --- /dev/null +++ b/common/src/main/java/org/keycloak/Version.java @@ -0,0 +1,37 @@ +package org.keycloak; + +import org.keycloak.util.Time; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +/** + * @author Bill Burke + * @version $Revision: 1 $ + */ +public class Version { + public static final String UNKNOWN = "UNKNOWN"; + public static String VERSION; + public static String RESOURCES_VERSION; + public static String BUILD_TIME; + + static { + Properties props = new Properties(); + InputStream is = Version.class.getResourceAsStream("/keycloak-version.properties"); + try { + props.load(is); + Version.VERSION = props.getProperty("version"); + Version.BUILD_TIME = props.getProperty("build-time"); + Version.RESOURCES_VERSION = Version.VERSION.toLowerCase(); + if (Version.RESOURCES_VERSION.endsWith("-snapshot")) { + Version.RESOURCES_VERSION = Version.RESOURCES_VERSION.replace("-snapshot", "-" + Time.currentTime()); + } + } catch (IOException e) { + Version.VERSION= Version.UNKNOWN; + Version.BUILD_TIME= Version.UNKNOWN; + } + + } + +} diff --git a/core/src/main/java/org/keycloak/constants/GenericConstants.java b/common/src/main/java/org/keycloak/constants/GenericConstants.java similarity index 100% rename from core/src/main/java/org/keycloak/constants/GenericConstants.java rename to common/src/main/java/org/keycloak/constants/GenericConstants.java diff --git a/core/src/main/java/org/keycloak/constants/KerberosConstants.java b/common/src/main/java/org/keycloak/constants/KerberosConstants.java similarity index 100% rename from core/src/main/java/org/keycloak/constants/KerberosConstants.java rename to common/src/main/java/org/keycloak/constants/KerberosConstants.java diff --git a/core/src/main/java/org/keycloak/constants/ServiceAccountConstants.java b/common/src/main/java/org/keycloak/constants/ServiceAccountConstants.java similarity index 100% rename from core/src/main/java/org/keycloak/constants/ServiceAccountConstants.java rename to common/src/main/java/org/keycloak/constants/ServiceAccountConstants.java diff --git a/core/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java b/common/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java similarity index 100% rename from core/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java rename to common/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java diff --git a/core/src/main/java/org/keycloak/enums/SslRequired.java b/common/src/main/java/org/keycloak/enums/SslRequired.java similarity index 100% rename from core/src/main/java/org/keycloak/enums/SslRequired.java rename to common/src/main/java/org/keycloak/enums/SslRequired.java diff --git a/core/src/main/java/org/keycloak/util/Base64.java b/common/src/main/java/org/keycloak/util/Base64.java similarity index 100% rename from core/src/main/java/org/keycloak/util/Base64.java rename to common/src/main/java/org/keycloak/util/Base64.java diff --git a/core/src/main/java/org/keycloak/util/Base64Url.java b/common/src/main/java/org/keycloak/util/Base64Url.java similarity index 100% rename from core/src/main/java/org/keycloak/util/Base64Url.java rename to common/src/main/java/org/keycloak/util/Base64Url.java diff --git a/core/src/main/java/org/keycloak/util/BouncyIntegration.java b/common/src/main/java/org/keycloak/util/BouncyIntegration.java similarity index 100% rename from core/src/main/java/org/keycloak/util/BouncyIntegration.java rename to common/src/main/java/org/keycloak/util/BouncyIntegration.java diff --git a/core/src/main/java/org/keycloak/util/CertificateUtils.java b/common/src/main/java/org/keycloak/util/CertificateUtils.java similarity index 100% rename from core/src/main/java/org/keycloak/util/CertificateUtils.java rename to common/src/main/java/org/keycloak/util/CertificateUtils.java diff --git a/core/src/main/java/org/keycloak/util/CollectionUtil.java b/common/src/main/java/org/keycloak/util/CollectionUtil.java similarity index 100% rename from core/src/main/java/org/keycloak/util/CollectionUtil.java rename to common/src/main/java/org/keycloak/util/CollectionUtil.java diff --git a/core/src/main/java/org/keycloak/util/DerUtils.java b/common/src/main/java/org/keycloak/util/DerUtils.java similarity index 100% rename from core/src/main/java/org/keycloak/util/DerUtils.java rename to common/src/main/java/org/keycloak/util/DerUtils.java diff --git a/core/src/main/java/org/keycloak/util/Encode.java b/common/src/main/java/org/keycloak/util/Encode.java similarity index 100% rename from core/src/main/java/org/keycloak/util/Encode.java rename to common/src/main/java/org/keycloak/util/Encode.java diff --git a/core/src/main/java/org/keycloak/util/EnvUtil.java b/common/src/main/java/org/keycloak/util/EnvUtil.java similarity index 100% rename from core/src/main/java/org/keycloak/util/EnvUtil.java rename to common/src/main/java/org/keycloak/util/EnvUtil.java diff --git a/core/src/main/java/org/keycloak/util/FindFile.java b/common/src/main/java/org/keycloak/util/FindFile.java similarity index 100% rename from core/src/main/java/org/keycloak/util/FindFile.java rename to common/src/main/java/org/keycloak/util/FindFile.java diff --git a/core/src/main/java/org/keycloak/util/HostUtils.java b/common/src/main/java/org/keycloak/util/HostUtils.java similarity index 100% rename from core/src/main/java/org/keycloak/util/HostUtils.java rename to common/src/main/java/org/keycloak/util/HostUtils.java diff --git a/core/src/main/java/org/keycloak/util/HtmlUtils.java b/common/src/main/java/org/keycloak/util/HtmlUtils.java similarity index 100% rename from core/src/main/java/org/keycloak/util/HtmlUtils.java rename to common/src/main/java/org/keycloak/util/HtmlUtils.java diff --git a/core/src/main/java/org/keycloak/util/KerberosSerializationUtils.java b/common/src/main/java/org/keycloak/util/KerberosSerializationUtils.java similarity index 100% rename from core/src/main/java/org/keycloak/util/KerberosSerializationUtils.java rename to common/src/main/java/org/keycloak/util/KerberosSerializationUtils.java diff --git a/core/src/main/java/org/keycloak/util/KeycloakUriBuilder.java b/common/src/main/java/org/keycloak/util/KeycloakUriBuilder.java similarity index 100% rename from core/src/main/java/org/keycloak/util/KeycloakUriBuilder.java rename to common/src/main/java/org/keycloak/util/KeycloakUriBuilder.java diff --git a/core/src/main/java/org/keycloak/util/KeystoreUtil.java b/common/src/main/java/org/keycloak/util/KeystoreUtil.java similarity index 100% rename from core/src/main/java/org/keycloak/util/KeystoreUtil.java rename to common/src/main/java/org/keycloak/util/KeystoreUtil.java diff --git a/core/src/main/java/org/keycloak/util/MimeTypeUtil.java b/common/src/main/java/org/keycloak/util/MimeTypeUtil.java similarity index 100% rename from core/src/main/java/org/keycloak/util/MimeTypeUtil.java rename to common/src/main/java/org/keycloak/util/MimeTypeUtil.java diff --git a/core/src/main/java/org/keycloak/util/MultivaluedHashMap.java b/common/src/main/java/org/keycloak/util/MultivaluedHashMap.java similarity index 100% rename from core/src/main/java/org/keycloak/util/MultivaluedHashMap.java rename to common/src/main/java/org/keycloak/util/MultivaluedHashMap.java diff --git a/core/src/main/java/org/keycloak/util/NetworkUtils.java b/common/src/main/java/org/keycloak/util/NetworkUtils.java similarity index 100% rename from core/src/main/java/org/keycloak/util/NetworkUtils.java rename to common/src/main/java/org/keycloak/util/NetworkUtils.java diff --git a/core/src/main/java/org/keycloak/util/ObjectUtil.java b/common/src/main/java/org/keycloak/util/ObjectUtil.java similarity index 100% rename from core/src/main/java/org/keycloak/util/ObjectUtil.java rename to common/src/main/java/org/keycloak/util/ObjectUtil.java diff --git a/core/src/main/java/org/keycloak/util/PathHelper.java b/common/src/main/java/org/keycloak/util/PathHelper.java similarity index 100% rename from core/src/main/java/org/keycloak/util/PathHelper.java rename to common/src/main/java/org/keycloak/util/PathHelper.java diff --git a/core/src/main/java/org/keycloak/util/PemUtils.java b/common/src/main/java/org/keycloak/util/PemUtils.java similarity index 100% rename from core/src/main/java/org/keycloak/util/PemUtils.java rename to common/src/main/java/org/keycloak/util/PemUtils.java diff --git a/core/src/main/java/org/keycloak/util/ServerCookie.java b/common/src/main/java/org/keycloak/util/ServerCookie.java similarity index 100% rename from core/src/main/java/org/keycloak/util/ServerCookie.java rename to common/src/main/java/org/keycloak/util/ServerCookie.java diff --git a/core/src/main/java/org/keycloak/util/StreamUtil.java b/common/src/main/java/org/keycloak/util/StreamUtil.java similarity index 100% rename from core/src/main/java/org/keycloak/util/StreamUtil.java rename to common/src/main/java/org/keycloak/util/StreamUtil.java diff --git a/core/src/main/java/org/keycloak/util/StringPropertyReplacer.java b/common/src/main/java/org/keycloak/util/StringPropertyReplacer.java similarity index 100% rename from core/src/main/java/org/keycloak/util/StringPropertyReplacer.java rename to common/src/main/java/org/keycloak/util/StringPropertyReplacer.java diff --git a/core/src/main/java/org/keycloak/util/SystemEnvProperties.java b/common/src/main/java/org/keycloak/util/SystemEnvProperties.java similarity index 100% rename from core/src/main/java/org/keycloak/util/SystemEnvProperties.java rename to common/src/main/java/org/keycloak/util/SystemEnvProperties.java diff --git a/core/src/main/java/org/keycloak/util/Time.java b/common/src/main/java/org/keycloak/util/Time.java similarity index 100% rename from core/src/main/java/org/keycloak/util/Time.java rename to common/src/main/java/org/keycloak/util/Time.java diff --git a/core/src/main/java/org/keycloak/util/UriUtils.java b/common/src/main/java/org/keycloak/util/UriUtils.java similarity index 100% rename from core/src/main/java/org/keycloak/util/UriUtils.java rename to common/src/main/java/org/keycloak/util/UriUtils.java diff --git a/core/src/main/java/org/keycloak/util/reflections/Reflections.java b/common/src/main/java/org/keycloak/util/reflections/Reflections.java similarity index 100% rename from core/src/main/java/org/keycloak/util/reflections/Reflections.java rename to common/src/main/java/org/keycloak/util/reflections/Reflections.java diff --git a/core/src/main/java/org/keycloak/util/reflections/SetAccessiblePrivilegedAction.java b/common/src/main/java/org/keycloak/util/reflections/SetAccessiblePrivilegedAction.java similarity index 100% rename from core/src/main/java/org/keycloak/util/reflections/SetAccessiblePrivilegedAction.java rename to common/src/main/java/org/keycloak/util/reflections/SetAccessiblePrivilegedAction.java diff --git a/core/src/main/java/org/keycloak/util/reflections/Types.java b/common/src/main/java/org/keycloak/util/reflections/Types.java similarity index 100% rename from core/src/main/java/org/keycloak/util/reflections/Types.java rename to common/src/main/java/org/keycloak/util/reflections/Types.java diff --git a/core/src/main/resources/keycloak-version.properties b/common/src/main/resources/keycloak-version.properties similarity index 100% rename from core/src/main/resources/keycloak-version.properties rename to common/src/main/resources/keycloak-version.properties diff --git a/core/pom.xml b/core/pom.xml index 694beb7fad9a..fa07bfa7d6db 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -25,6 +25,10 @@ + + org.keycloak + keycloak-common + org.bouncycastle bcprov-jdk15on diff --git a/core/src/main/java/org/keycloak/Version.java b/core/src/main/java/org/keycloak/Version.java deleted file mode 100755 index 2ba5b9b4588c..000000000000 --- a/core/src/main/java/org/keycloak/Version.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.keycloak; - -import org.codehaus.jackson.annotate.JsonProperty; -import org.keycloak.util.Time; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class Version { - public static String VERSION; - public static String RESOURCES_VERSION; - public static String BUILD_TIME; - public static final String UNKNOWN = "UNKNOWN"; - public static final Version SINGLETON; - - private final String version = VERSION; - private final String buildTime = BUILD_TIME; - - static { - Properties props = new Properties(); - InputStream is = Version.class.getResourceAsStream("/keycloak-version.properties"); - try { - props.load(is); - VERSION = props.getProperty("version"); - BUILD_TIME = props.getProperty("build-time"); - RESOURCES_VERSION = VERSION.toLowerCase(); - if (RESOURCES_VERSION.endsWith("-snapshot")) { - RESOURCES_VERSION = RESOURCES_VERSION.replace("-snapshot", "-" + Time.currentTime()); - } - } catch (IOException e) { - VERSION=UNKNOWN; - BUILD_TIME=UNKNOWN; - } - - SINGLETON = new Version(); - } - - @JsonProperty("version") - public String getVersion() { - return version; - } - - @JsonProperty("build-time") - public String getBuildTime() { - return buildTime; - } -} diff --git a/core/src/main/java/org/keycloak/representations/VersionRepresentation.java b/core/src/main/java/org/keycloak/representations/VersionRepresentation.java new file mode 100755 index 000000000000..09505525f39d --- /dev/null +++ b/core/src/main/java/org/keycloak/representations/VersionRepresentation.java @@ -0,0 +1,29 @@ +package org.keycloak.representations; + +import org.codehaus.jackson.annotate.JsonProperty; +import org.keycloak.Version; + +/** + * @author Bill Burke + * @version $Revision: 1 $ + */ +public class VersionRepresentation { + public static final VersionRepresentation SINGLETON; + + private final String version = Version.VERSION; + private final String buildTime = Version.BUILD_TIME; + + static { + SINGLETON = new VersionRepresentation(); + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("build-time") + public String getBuildTime() { + return buildTime; + } +} diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml index 32755c2aa0d5..7e1565ee2270 100755 --- a/dependencies/server-min/pom.xml +++ b/dependencies/server-min/pom.xml @@ -15,6 +15,10 @@ + + org.keycloak + keycloak-common + org.keycloak keycloak-core diff --git a/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml b/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml index 1f028985f47b..48141f9691c8 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml @@ -12,6 +12,7 @@ ${project.build.directory}/unpacked org/bouncycastle/** + org/keycloak/keycloak-common/** org/keycloak/keycloak-core/** org/keycloak/keycloak-adapter-spi/** org/keycloak/keycloak-adapter-core/** diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/build.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/build.xml index cbf50eacfccc..4783596c63a7 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/build.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/build.xml @@ -38,6 +38,9 @@ + + + diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml index 21eeb8148acd..a2b83132fd52 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml @@ -17,6 +17,10 @@ Keycloak AS7 / JBoss EAP 6 Modules pom + + org.keycloak + keycloak-common + org.keycloak keycloak-core diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml index bb8407f0d52f..1eeaf4f8f78b 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml @@ -13,6 +13,7 @@ + diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml index 635c3cc2ff0d..4ecf6981f688 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml @@ -13,7 +13,7 @@ - + diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml index 05053c1f84ac..4e7a74a419e7 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml @@ -20,6 +20,7 @@ + diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml similarity index 70% rename from distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml index dab80400a813..b7bcee4e9711 100755 --- a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml @@ -2,14 +2,11 @@ - + - - - diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml index dab80400a813..8af82f4cde02 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml @@ -11,6 +11,7 @@ + diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml index 645d8ece2030..d7517649adc1 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml @@ -11,7 +11,7 @@ - + diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml index c906cc9d5462..727ca5341eda 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml @@ -12,6 +12,7 @@ + diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml index 0f2a75b47d28..d8c6c125d11f 100755 --- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml +++ b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml @@ -12,6 +12,7 @@ ${project.build.directory}/unpacked org/bouncycastle/** + org/keycloak/keycloak-common/** org/keycloak/keycloak-core/** org/keycloak/keycloak-adapter-spi/** org/keycloak/keycloak-adapter-core/** diff --git a/distribution/adapters/osgi/features/src/main/resources/features.xml b/distribution/adapters/osgi/features/src/main/resources/features.xml old mode 100644 new mode 100755 index 7cda6d134a57..4230886b7576 --- a/distribution/adapters/osgi/features/src/main/resources/features.xml +++ b/distribution/adapters/osgi/features/src/main/resources/features.xml @@ -10,6 +10,7 @@ mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version} mvn:org.codehaus.jackson/jackson-xc/${jackson.version} mvn:org.jboss.logging/jboss-logging/${jboss.logging.version} + mvn:org.keycloak/keycloak-common/${project.version} mvn:org.keycloak/keycloak-core/${project.version} mvn:org.keycloak/keycloak-adapter-core/${project.version} diff --git a/distribution/adapters/wf8-adapter/wf8-adapter-zip/assembly.xml b/distribution/adapters/wf8-adapter/wf8-adapter-zip/assembly.xml index ad0cc64bdd67..74a27ab07688 100755 --- a/distribution/adapters/wf8-adapter/wf8-adapter-zip/assembly.xml +++ b/distribution/adapters/wf8-adapter/wf8-adapter-zip/assembly.xml @@ -12,6 +12,7 @@ ${project.build.directory}/unpacked org/apache/httpcomponents/** + org/keycloak/keycloak-common/** org/keycloak/keycloak-core/** org/keycloak/keycloak-adapter-spi/** org/keycloak/keycloak-adapter-core/** diff --git a/distribution/adapters/wf8-adapter/wf8-modules/build.xml b/distribution/adapters/wf8-adapter/wf8-modules/build.xml index e442fefd2ea3..47cd5eae908e 100755 --- a/distribution/adapters/wf8-adapter/wf8-modules/build.xml +++ b/distribution/adapters/wf8-adapter/wf8-modules/build.xml @@ -38,6 +38,10 @@ + + + + diff --git a/distribution/adapters/wf8-adapter/wf8-modules/pom.xml b/distribution/adapters/wf8-adapter/wf8-modules/pom.xml index e652edea5d10..cf66579aa25a 100755 --- a/distribution/adapters/wf8-adapter/wf8-modules/pom.xml +++ b/distribution/adapters/wf8-adapter/wf8-modules/pom.xml @@ -17,6 +17,10 @@ Keycloak Wildfly 8 Modules pom + + org.keycloak + keycloak-common + org.keycloak keycloak-core diff --git a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml index f763148b8339..d872710c90cb 100755 --- a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml +++ b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml @@ -15,6 +15,7 @@ + diff --git a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml index 28c05439bc54..8b6b037e1aab 100755 --- a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml +++ b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml @@ -14,7 +14,7 @@ - + diff --git a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml new file mode 100755 index 000000000000..b7bcee4e9711 --- /dev/null +++ b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml index dab80400a813..a2d115e28287 100755 --- a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml +++ b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml index f1ee530cdadd..cf898253ffe3 100755 --- a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml +++ b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml @@ -11,8 +11,7 @@ - - + diff --git a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml index 1e92a95caa43..bfc6e96d910c 100755 --- a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml +++ b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml @@ -13,6 +13,7 @@ + diff --git a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml index c3f1775464b6..6486f1e43f1e 100755 --- a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml +++ b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml @@ -20,6 +20,7 @@ + diff --git a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml index c0786cfe6992..ce5911d7ba96 100755 --- a/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml +++ b/distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml @@ -22,6 +22,7 @@ + diff --git a/distribution/adapters/wf9-adapter/wf9-adapter-zip/assembly.xml b/distribution/adapters/wf9-adapter/wf9-adapter-zip/assembly.xml index 39146d03b6f2..c0d82bc2e1ed 100755 --- a/distribution/adapters/wf9-adapter/wf9-adapter-zip/assembly.xml +++ b/distribution/adapters/wf9-adapter/wf9-adapter-zip/assembly.xml @@ -11,6 +11,7 @@ ${project.build.directory}/unpacked + org/keycloak/keycloak-common/** org/keycloak/keycloak-core/** org/keycloak/keycloak-adapter-core/** org/keycloak/keycloak-adapter-spi/** diff --git a/distribution/adapters/wf9-adapter/wf9-modules/build.xml b/distribution/adapters/wf9-adapter/wf9-modules/build.xml index 9e4109a2b206..f3223d87c5d5 100755 --- a/distribution/adapters/wf9-adapter/wf9-modules/build.xml +++ b/distribution/adapters/wf9-adapter/wf9-modules/build.xml @@ -38,6 +38,10 @@ + + + + diff --git a/distribution/adapters/wf9-adapter/wf9-modules/pom.xml b/distribution/adapters/wf9-adapter/wf9-modules/pom.xml index 270cc558331e..e32893e83e7b 100755 --- a/distribution/adapters/wf9-adapter/wf9-modules/pom.xml +++ b/distribution/adapters/wf9-adapter/wf9-modules/pom.xml @@ -17,6 +17,10 @@ Keycloak Wildfly 9 Modules pom + + org.keycloak + keycloak-common + org.keycloak keycloak-core diff --git a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml index 74b361e96a6f..3139dc674b8b 100755 --- a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml +++ b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml @@ -14,6 +14,7 @@ + diff --git a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml index 850c46a2f508..a0ed776e5bd7 100755 --- a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml +++ b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml @@ -8,7 +8,7 @@ - + diff --git a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml new file mode 100755 index 000000000000..b7bcee4e9711 --- /dev/null +++ b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml index dab80400a813..a2d115e28287 100755 --- a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml +++ b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml index f1ee530cdadd..cf898253ffe3 100755 --- a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml +++ b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml @@ -11,8 +11,7 @@ - - + diff --git a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml index c906cc9d5462..727ca5341eda 100755 --- a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml +++ b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml @@ -12,6 +12,7 @@ + diff --git a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml index 4dd6f2d10247..64258088cb81 100755 --- a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml +++ b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml @@ -20,6 +20,7 @@ + diff --git a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml index 853ca8d8e153..ac99ce246962 100755 --- a/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml +++ b/distribution/adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml @@ -22,6 +22,7 @@ + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml index 0a65ebd27248..afa71d407327 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml @@ -14,6 +14,7 @@ + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-spi/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-spi/main/module.xml index d33ddc31e882..2e1dcdc01927 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-spi/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-spi/main/module.xml @@ -15,7 +15,7 @@ - + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-common/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-common/main/module.xml new file mode 100755 index 000000000000..3725356f3a88 --- /dev/null +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-common/main/module.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml old mode 100644 new mode 100755 index dccd31598aae..fac8fce80171 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-jboss-adapter-core/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-jboss-adapter-core/main/module.xml index c836034a0894..0c2b41e9f530 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-jboss-adapter-core/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-jboss-adapter-core/main/module.xml @@ -11,8 +11,7 @@ - - + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-servlet-oauth-client/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-servlet-oauth-client/main/module.xml index fb39438ae000..ae4075060305 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-servlet-oauth-client/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-servlet-oauth-client/main/module.xml @@ -12,6 +12,7 @@ + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-undertow-adapter/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-undertow-adapter/main/module.xml index b813b7f79566..0a9d29c6d0b3 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-undertow-adapter/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-undertow-adapter/main/module.xml @@ -20,6 +20,7 @@ + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adapter/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adapter/main/module.xml index 46107668ddfb..af4f6d4603df 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adapter/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adapter/main/module.xml @@ -21,6 +21,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml old mode 100644 new mode 100755 index ff79ea3da7ce..32d13c0f1834 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml @@ -9,6 +9,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml old mode 100644 new mode 100755 index 12a27b49f518..528f98279b15 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml @@ -11,6 +11,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml old mode 100644 new mode 100755 index 148ca83b0ca8..b7ed82e65e7e --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml old mode 100644 new mode 100755 index 5f1696b5f0fb..2f4a97da0bf1 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml old mode 100644 new mode 100755 index 78800f80b586..c982863e0db9 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml @@ -6,6 +6,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-common/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-common/main/module.xml new file mode 100755 index 000000000000..3725356f3a88 --- /dev/null +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-common/main/module.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-file/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-file/main/module.xml old mode 100644 new mode 100755 index 2821a8263224..5400a883d3a5 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-file/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-file/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml index 33acbc3fb401..27295ddf1575 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-infinispan/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-infinispan/main/module.xml old mode 100644 new mode 100755 index 6ec7f490c75f..cbaabbd8f3f6 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-infinispan/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-infinispan/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml old mode 100644 new mode 100755 index 2e001ae34071..9b5f9e804840 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml old mode 100644 new mode 100755 index befbaca0f831..e1474fb7ed82 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml old mode 100644 new mode 100755 index 5af24c9c7406..74b1e82b6015 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml old mode 100644 new mode 100755 index c1820d0ba8ce..c989e2e7b8a8 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core-jaxrs/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core-jaxrs/main/module.xml old mode 100644 new mode 100755 index e894d322b4c9..888c32a0fd8d --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core-jaxrs/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core-jaxrs/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml old mode 100644 new mode 100755 index dccd31598aae..0e1d7b3ad2ee --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml old mode 100644 new mode 100755 index 7936e57258cb..7d0c88369078 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml old mode 100644 new mode 100755 index 5d7e738c44c2..d569144bab1c --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml @@ -11,6 +11,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml old mode 100644 new mode 100755 index 6bf4c5725461..ef28fe20dbba --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml @@ -9,6 +9,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml old mode 100644 new mode 100755 index 8c924b9464a6..4d13741e01a1 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml old mode 100644 new mode 100755 index cb3911e6bf71..adec7b0b08f9 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml old mode 100644 new mode 100755 index 51820cbba4b6..cedcb4b1d5b7 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml old mode 100644 new mode 100755 index 58f4ef6613d4..d8b2419447f5 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml old mode 100644 new mode 100755 index deeec3e0624a..f2c06cd34b0c --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml old mode 100644 new mode 100755 index 760221ad1b81..66882cabf166 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml old mode 100644 new mode 100755 index f5c0478bea55..b9c72214874e --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-zip/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-zip/main/module.xml old mode 100644 new mode 100755 index 94278c6ff135..2324a65cac71 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-zip/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-zip/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml old mode 100644 new mode 100755 index 9c2d04519bc8..843ff870c472 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-themes/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-themes/main/module.xml old mode 100644 new mode 100755 index b6bb215b0157..9dc3cd06ac31 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-themes/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-themes/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml old mode 100644 new mode 100755 index 1fbd5a83b3e8..2b999c412cbb --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml old mode 100644 new mode 100755 index a9dc766083b5..8961652bcd0e --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml @@ -11,6 +11,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml old mode 100644 new mode 100755 index 8d63396905dc..eedb59783ee6 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-ldap-federation/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-ldap-federation/main/module.xml old mode 100644 new mode 100755 index b1bd769a2cff..2619043193fc --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-ldap-federation/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-ldap-federation/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml old mode 100644 new mode 100755 index 137514de0cbf..6eff13469790 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml old mode 100644 new mode 100755 index ba3b629c0efd..3b0e961ef77c --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml @@ -12,6 +12,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-api/main/module.xml old mode 100644 new mode 100755 index f74bf32a14a6..e3946bcc9b5a --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-api/main/module.xml @@ -8,6 +8,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-file/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-file/main/module.xml old mode 100644 new mode 100755 index d21a5372fc8a..2612e06451fd --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-file/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-file/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml old mode 100644 new mode 100755 index 4e8eafe30b23..fa77d5ef110f --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml old mode 100644 new mode 100755 index 1b8b892d65e6..63b46c9ffcc4 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml old mode 100644 new mode 100755 index 877f06117341..db50bebc8429 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-core/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-core/main/module.xml index 45b2e52419ef..2b77d28ff1f7 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-core/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-core/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml old mode 100644 new mode 100755 index 03a5633d1fe0..fbd65fd5cbcd --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml index 38ecba81fe07..936b53218873 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml @@ -9,6 +9,7 @@ + @@ -60,6 +61,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml old mode 100644 new mode 100755 index d3469c1ce061..ee598198c000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml @@ -19,6 +19,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-core/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-core/main/module.xml old mode 100644 new mode 100755 index 47a1348ba661..fd34f6980247 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-core/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-core/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-facebook/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-facebook/main/module.xml old mode 100644 new mode 100755 index 30a2489b3ade..4f43799ad94a --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-facebook/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-facebook/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-github/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-github/main/module.xml old mode 100644 new mode 100755 index 6a8e0c3276f5..379e4fd1b990 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-github/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-github/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-google/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-google/main/module.xml old mode 100644 new mode 100755 index 965a0e48e49e..94120488efa6 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-google/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-google/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-linkedin/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-linkedin/main/module.xml old mode 100644 new mode 100755 index 3bba4a8d6b61..80ab8b0537de --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-linkedin/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-linkedin/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-stackoverflow/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-stackoverflow/main/module.xml old mode 100644 new mode 100755 index a1ac0830a9d8..0546fb05d9b4 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-stackoverflow/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-stackoverflow/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-twitter/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-twitter/main/module.xml old mode 100644 new mode 100755 index f07af8b22191..fd009217976e --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-twitter/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-twitter/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml old mode 100644 new mode 100755 index af13ac0a9f1e..c527a0b9c390 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml @@ -8,6 +8,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml old mode 100644 new mode 100755 index 1ee1936fd91b..8e3470e293df --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml @@ -9,6 +9,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-extensions/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-extensions/main/module.xml old mode 100644 new mode 100755 index 58d5184390ac..2315359e10e3 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-extensions/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-extensions/main/module.xml @@ -4,6 +4,7 @@ + diff --git a/distribution/saml-adapters/wf9-adapter/wf9-adapter-zip/assembly.xml b/distribution/saml-adapters/wf9-adapter/wf9-adapter-zip/assembly.xml index b238f9752240..df413f239ba3 100755 --- a/distribution/saml-adapters/wf9-adapter/wf9-adapter-zip/assembly.xml +++ b/distribution/saml-adapters/wf9-adapter/wf9-adapter-zip/assembly.xml @@ -11,7 +11,7 @@ ${project.build.directory}/unpacked - org/keycloak/keycloak-core/** + org/keycloak/keycloak-common/** org/keycloak/keycloak-saml-core/** org/keycloak/keycloak-saml-adapter-core/** org/keycloak/keycloak-adapter-spi/** diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/build.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/build.xml index 33c8ac3070ac..ab5da84157c6 100755 --- a/distribution/saml-adapters/wf9-adapter/wf9-modules/build.xml +++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/build.xml @@ -38,11 +38,10 @@ - - + + - diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/pom.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/pom.xml index 6b9e5333942a..e8a339044976 100755 --- a/distribution/saml-adapters/wf9-adapter/wf9-modules/pom.xml +++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/pom.xml @@ -19,7 +19,7 @@ org.keycloak - keycloak-core + keycloak-common org.keycloak diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml index 850c46a2f508..a0ed776e5bd7 100755 --- a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml +++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml @@ -8,7 +8,7 @@ - + diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml new file mode 100755 index 000000000000..b7bcee4e9711 --- /dev/null +++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml index f1ee530cdadd..cf898253ffe3 100755 --- a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml +++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml @@ -11,8 +11,7 @@ - - + diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-adapter-core/main/module.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-adapter-core/main/module.xml index 0f58e3b76e39..f9399db215eb 100755 --- a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-adapter-core/main/module.xml +++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-adapter-core/main/module.xml @@ -11,7 +11,7 @@ - + diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml index 7f75d0c97219..6a7cd653cd4f 100755 --- a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml +++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml @@ -8,7 +8,7 @@ - + diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-undertow-adapter/main/module.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-undertow-adapter/main/module.xml index 1613412bc4cd..e9c202b8f7c7 100755 --- a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-undertow-adapter/main/module.xml +++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-undertow-adapter/main/module.xml @@ -17,7 +17,7 @@ - + diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-wildfly-adapter/main/module.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-wildfly-adapter/main/module.xml index f4ae641c7fcd..289d9ae233a6 100755 --- a/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-wildfly-adapter/main/module.xml +++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-saml-wildfly-adapter/main/module.xml @@ -18,7 +18,7 @@ - + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/build.xml b/distribution/server-overlay/eap6/eap6-server-modules/build.xml index 0989c39ce626..d07ef7204e6b 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/build.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/build.xml @@ -38,6 +38,10 @@ + + + + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/pom.xml b/distribution/server-overlay/eap6/eap6-server-modules/pom.xml index 59b572cf784a..d5e0366c32b2 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/pom.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/pom.xml @@ -22,6 +22,10 @@ keycloak-dependencies-server-all pom + + org.keycloak + keycloak-common + org.keycloak keycloak-core diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml index 1eba478b0797..14025832e800 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-api/main/module.xml @@ -9,6 +9,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml index 34840a633915..f6c67394c2d4 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-account-freemarker/main/module.xml @@ -11,6 +11,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml index 38ecba81fe07..936b53218873 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml @@ -9,6 +9,7 @@ + @@ -60,6 +61,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml index 825ba3124d6f..fac17da2f999 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-core/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml index 651547dbfff6..f2155cb6661f 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-oidc/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml index 0f2a22bfd853..93656fdfd460 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml @@ -6,6 +6,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml new file mode 100755 index 000000000000..b7bcee4e9711 --- /dev/null +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-file/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-file/main/module.xml old mode 100644 new mode 100755 index 14c8bea48993..a881b2b67274 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-file/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-file/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-http-client/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-http-client/main/module.xml index 630a09e62be9..60489b2cfc0e 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-http-client/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-http-client/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml index d63e4df8483d..d24f65525204 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-infinispan/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml index 041108c57ac8..fc0bac360c48 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml index c2b14a3ff2e2..62cab55b6e06 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-jpa/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml old mode 100644 new mode 100755 index c14a06196d7c..88f3f9efe512 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml index 3decf9a8f4fc..d69f00318431 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml index 68d8e5b961e2..36d2a7d40204 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core-jaxrs/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml index dab80400a813..54c45abec653 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml index 238d86db271d..316a3022fdc8 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-api/main/module.xml @@ -9,6 +9,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml index d9e9141efe77..a8e960ced8f3 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-email-freemarker/main/module.xml @@ -11,6 +11,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml index 5e3279d73ccf..4869de437500 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-api/main/module.xml @@ -9,6 +9,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml index fd67f343d1fe..61467f2fd3f1 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-email/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml index c2408274d569..fe05f756dddc 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jboss-logging/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml index 78608224ce44..6038db81a31d 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-jpa/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml index 4e72c8c30646..0e146a1cddc1 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml index 329e08982e11..14f32f4caf55 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-api/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml index cdb3536a4c8d..529848b30e46 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-dir/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml index 647004396e31..72a7829ecaa0 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-single-file/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml index 6f672dcb1e7b..e82fe4e8dc30 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-export-import-zip/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml index aebe235ed50f..da511a8d8eae 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-freemarker/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml index 33bb178472ec..c8c878819cff 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-forms-common-themes/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml index a80921e577cc..b07de1dad305 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml index 54861333e018..e889bd638f9f 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-invalidation-cache-model/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-kerberos-federation/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-kerberos-federation/main/module.xml old mode 100644 new mode 100755 index 7f610a679a2e..94a5bb5971ad --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-kerberos-federation/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-kerberos-federation/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml index 3ef2bd3b746a..63688676648c 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-ldap-federation/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml index 372d7088796a..ac315adf2446 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-api/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml index 7c3247b42fec..e9085a5df48e 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-login-freemarker/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml index f19e0d3d730f..aa91b85177b4 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-api/main/module.xml @@ -8,6 +8,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-file/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-file/main/module.xml index 6e23217770d8..46f8ffd25d95 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-file/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-file/main/module.xml @@ -5,6 +5,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml index 379d5fb03991..e71238b29676 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-jpa/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml index bee88ddcd541..64fcc4856ee4 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml index f2c564b805b9..244c5b9c3278 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml index 7f75d0c97219..6a7cd653cd4f 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-core/main/module.xml @@ -8,7 +8,7 @@ - + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml index b287cbc67cc3..d9e29229efdd 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml index cbfe05e6ab12..807018d8bede 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml @@ -19,6 +19,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml index 31c7e95f1413..aa7287b7c81f 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-core/main/module.xml @@ -10,6 +10,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml index f842f83cdc30..bb393cfef2e8 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-facebook/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml index 86f47742ffbd..5fca655f0fd9 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-github/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml index d2cd5d642917..53acaa91e401 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-google/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-linkedin/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-linkedin/main/module.xml index 34e847ec334a..ec3dc8b505b4 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-linkedin/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-linkedin/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-stackoverflow/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-stackoverflow/main/module.xml index 5d8c98d6e096..f2d0ad8e6469 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-stackoverflow/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-stackoverflow/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml index a7ca1d435fdd..f06517330a4a 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-social-twitter/main/module.xml @@ -7,6 +7,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml index 474fa0184cd0..c933335204de 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-api/main/module.xml @@ -8,6 +8,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml index dbb65bc22387..bf1ee1ab2ca0 100755 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-timer-basic/main/module.xml @@ -9,6 +9,7 @@ + diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-extensions/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-extensions/main/module.xml old mode 100644 new mode 100755 index 787fd2f09f0e..1099de714435 --- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-extensions/main/module.xml +++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-extensions/main/module.xml @@ -4,6 +4,7 @@ + diff --git a/examples/saml/post-with-encryption/README.md b/examples/saml/post-with-encryption/README.md index d77269b47224..b97fbb788629 100755 --- a/examples/saml/post-with-encryption/README.md +++ b/examples/saml/post-with-encryption/README.md @@ -22,5 +22,8 @@ $ mvn clean install wildfly:deploy ## Access the application -The application will be running at the following URL: . +The application will be running at the following URL: . Login with: + + username: bburke + password: password diff --git a/examples/saml/post-with-signature/README.md b/examples/saml/post-with-signature/README.md index 11d1d36e2c5f..60a3f90a256d 100755 --- a/examples/saml/post-with-signature/README.md +++ b/examples/saml/post-with-signature/README.md @@ -22,5 +22,9 @@ $ mvn clean install wildfly:deploy ## Access the application -The application will be running at the following URL: . +The application will be running at the following URL: . Login with: + + username: bburke + password: password + diff --git a/examples/saml/redirect-with-signature/README.md b/examples/saml/redirect-with-signature/README.md index 6340380b4ef5..4a22af19d550 100755 --- a/examples/saml/redirect-with-signature/README.md +++ b/examples/saml/redirect-with-signature/README.md @@ -24,3 +24,8 @@ $ mvn clean install wildfly:deploy The application will be running at the following URL: . +The application will be running at the following URL: . Login with: + + username: bburke + password: password + diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java b/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java index 0ecc10a1ce05..25b4c4678f67 100755 --- a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java +++ b/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java @@ -1,7 +1,7 @@ package org.keycloak.exportimport.util; import org.jboss.logging.Logger; -import org.keycloak.Version; +import org.keycloak.representations.VersionRepresentation; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.ExportProvider; import org.keycloak.exportimport.UsersExportStrategy; @@ -41,13 +41,13 @@ public void run(KeycloakSession session) { exportRealmImpl(factory, realm.getName()); } - writeVersion("version.json", Version.SINGLETON); + writeVersion("version.json", VersionRepresentation.SINGLETON); } @Override public void exportRealm(KeycloakSessionFactory factory, String realmName) throws IOException { exportRealmImpl(factory, realmName); - writeVersion("version.json", Version.SINGLETON); + writeVersion("version.json", VersionRepresentation.SINGLETON); } protected void exportRealmImpl(KeycloakSessionFactory factory, final String realmName) throws IOException { @@ -110,7 +110,7 @@ protected void runExportImportTask(KeycloakSession session) throws IOException { protected abstract void writeUsers(String fileName, KeycloakSession session, RealmModel realm, List users) throws IOException; - protected abstract void writeVersion(String fileName, Version version) throws IOException; + protected abstract void writeVersion(String fileName, VersionRepresentation version) throws IOException; public static class RealmsHolder { List realms; diff --git a/export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java b/export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java index 175629929f77..814a2d20becc 100755 --- a/export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java +++ b/export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java @@ -1,6 +1,6 @@ package org.keycloak.exportimport.dir; -import org.keycloak.Version; +import org.keycloak.representations.VersionRepresentation; import org.keycloak.exportimport.util.ExportUtils; import org.keycloak.exportimport.util.MultipleStepsExportProvider; import org.keycloak.models.KeycloakSession; @@ -70,7 +70,7 @@ protected void writeUsers(String fileName, KeycloakSession session, RealmModel r } @Override - protected void writeVersion(String fileName, Version version) throws IOException { + protected void writeVersion(String fileName, VersionRepresentation version) throws IOException { File file = new File(this.rootDirectory, fileName); FileOutputStream stream = new FileOutputStream(file); JsonSerialization.prettyMapper.writeValue(stream, version); diff --git a/export-import/export-import-zip/src/main/java/org/keycloak/exportimport/zip/ZipExportProvider.java b/export-import/export-import-zip/src/main/java/org/keycloak/exportimport/zip/ZipExportProvider.java index 351778865897..1c9212e19858 100755 --- a/export-import/export-import-zip/src/main/java/org/keycloak/exportimport/zip/ZipExportProvider.java +++ b/export-import/export-import-zip/src/main/java/org/keycloak/exportimport/zip/ZipExportProvider.java @@ -4,7 +4,7 @@ import de.idyl.winzipaes.impl.AESEncrypter; import de.idyl.winzipaes.impl.AESEncrypterBC; import org.jboss.logging.Logger; -import org.keycloak.Version; +import org.keycloak.representations.VersionRepresentation; import org.keycloak.exportimport.util.ExportUtils; import org.keycloak.exportimport.util.MultipleStepsExportProvider; import org.keycloak.models.KeycloakSession; @@ -59,7 +59,7 @@ protected void writeUsers(String fileName, KeycloakSession session, RealmModel r } @Override - protected void writeVersion(String fileName, Version version) throws IOException { + protected void writeVersion(String fileName, VersionRepresentation version) throws IOException { ByteArrayOutputStream stream = new ByteArrayOutputStream(); JsonSerialization.mapper.writeValue(stream, version); writeStream(fileName, stream); diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java index cd5455cb2390..5380e007d42e 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java @@ -1,7 +1,7 @@ package org.keycloak.adapters; import org.jboss.logging.Logger; -import org.keycloak.Version; +import org.keycloak.representations.VersionRepresentation; import org.keycloak.constants.AdapterConstants; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.crypto.RSAProvider; @@ -215,7 +215,7 @@ protected void handleVersion() { try { facade.getResponse().setStatus(200); facade.getResponse().setHeader("Content-Type", "application/json"); - JsonSerialization.writeValueToStream(facade.getResponse().getOutputStream(), Version.SINGLETON); + JsonSerialization.writeValueToStream(facade.getResponse().getOutputStream(), VersionRepresentation.SINGLETON); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/integration/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/KeycloakDependencyProcessor.java b/integration/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/KeycloakDependencyProcessor.java index 60a51a668ffe..07a2f9d067eb 100755 --- a/integration/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/KeycloakDependencyProcessor.java +++ b/integration/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/KeycloakDependencyProcessor.java @@ -37,6 +37,7 @@ public abstract class KeycloakDependencyProcessor implements DeploymentUnitProce private static final ModuleIdentifier KEYCLOAK_JBOSS_CORE_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-jboss-adapter-core"); private static final ModuleIdentifier KEYCLOAK_CORE_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-adapter-core"); private static final ModuleIdentifier KEYCLOAK_CORE = ModuleIdentifier.create("org.keycloak.keycloak-core"); + private static final ModuleIdentifier KEYCLOAK_COMMON = ModuleIdentifier.create("org.keycloak.keycloak-common"); @Override public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { @@ -55,6 +56,7 @@ private void addCommonModules(ModuleSpecification moduleSpecification, ModuleLoa moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_JBOSS_CORE_ADAPTER, false, false, false, false)); moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_CORE_ADAPTER, false, false, false, false)); moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_CORE, false, false, false, false)); + moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_COMMON, false, false, false, false)); } abstract protected void addPlatformSpecificModules(ModuleSpecification moduleSpecification, ModuleLoader moduleLoader); diff --git a/integration/jboss-adapter-core/pom.xml b/integration/jboss-adapter-core/pom.xml index 427b53453918..d74ee32d634d 100755 --- a/integration/jboss-adapter-core/pom.xml +++ b/integration/jboss-adapter-core/pom.xml @@ -22,7 +22,7 @@ org.keycloak - keycloak-core + keycloak-common org.keycloak diff --git a/integration/jetty/jetty-adapter-spi/pom.xml b/integration/jetty/jetty-adapter-spi/pom.xml index 714de2b27919..32044fe4f108 100755 --- a/integration/jetty/jetty-adapter-spi/pom.xml +++ b/integration/jetty/jetty-adapter-spi/pom.xml @@ -33,7 +33,7 @@ org.keycloak - keycloak-core + keycloak-common org.keycloak diff --git a/integration/tomcat/tomcat-adapter-spi/pom.xml b/integration/tomcat/tomcat-adapter-spi/pom.xml index eb707111729b..38a715579c79 100755 --- a/integration/tomcat/tomcat-adapter-spi/pom.xml +++ b/integration/tomcat/tomcat-adapter-spi/pom.xml @@ -30,7 +30,7 @@ org.keycloak - keycloak-core + keycloak-common