diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml index 5e4f9b5db8..2c7a0f1fdc 100755 --- a/dependencies/server-min/pom.xml +++ b/dependencies/server-min/pom.xml @@ -61,10 +61,6 @@ - - org.keycloak - keycloak-forms-common-freemarker - org.freemarker freemarker @@ -73,19 +69,6 @@ org.keycloak keycloak-forms-common-themes - - org.keycloak - keycloak-account-freemarker - - - org.keycloak - keycloak-email-freemarker - - - org.keycloak - keycloak-login-freemarker - - org.keycloak keycloak-connections-truststore 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 deleted file mode 100755 index ab7d2608df..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100755 index 324e131755..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100755 index 8e152354dd..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - 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 index 7900d0c2fa..1727a44eea 100755 --- 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 @@ -8,7 +8,6 @@ - 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 deleted file mode 100755 index e25a46abe6..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - 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 index f9b6ad766c..1969666560 100755 --- 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 @@ -12,7 +12,6 @@ - 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 0086c22027..cf81910a5d 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 @@ -1,7 +1,6 @@ - @@ -10,19 +9,16 @@ - - - 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 index 8c2e2a8024..70108f5a12 100755 --- 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 @@ -7,7 +7,6 @@ - @@ -19,19 +18,16 @@ - - - @@ -47,6 +43,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 index e536b6c21e..3fed42053e 100755 --- 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 @@ -8,7 +8,6 @@ - diff --git a/forms/account-freemarker/pom.xml b/forms/account-freemarker/pom.xml deleted file mode 100755 index 1b2ccd9aa2..0000000000 --- a/forms/account-freemarker/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - keycloak-forms-parent - org.keycloak - 1.9.0.CR1-SNAPSHOT - ../pom.xml - - 4.0.0 - - keycloak-account-freemarker - Keycloak Account Management FreeMarker - - - - - org.keycloak - keycloak-core - provided - - - org.keycloak - keycloak-server-spi - provided - - - org.keycloak - keycloak-forms-common-freemarker - provided - - - org.keycloak - keycloak-services - provided - - - org.jboss.logging - jboss-logging - provided - - - org.jboss.resteasy - resteasy-jaxrs - provided - - - org.freemarker - freemarker - provided - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - - diff --git a/forms/common-freemarker/pom.xml b/forms/common-freemarker/pom.xml deleted file mode 100755 index 41b0cd63d1..0000000000 --- a/forms/common-freemarker/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - keycloak-forms-parent - org.keycloak - 1.9.0.CR1-SNAPSHOT - ../pom.xml - - 4.0.0 - - keycloak-forms-common-freemarker - Keycloak Forms Common FreeMarker - - - - - org.keycloak - keycloak-core - provided - - - org.keycloak - keycloak-server-spi - provided - - - org.jboss.resteasy - resteasy-jaxrs - provided - - - org.freemarker - freemarker - provided - - - org.jboss.logging - jboss-logging - provided - - - junit - junit - test - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - - diff --git a/forms/common-freemarker/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory b/forms/common-freemarker/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory deleted file mode 100755 index c3dcd8ca18..0000000000 --- a/forms/common-freemarker/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.freemarker.ExtendingThemeManagerFactory \ No newline at end of file diff --git a/forms/common-freemarker/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/forms/common-freemarker/src/main/resources/META-INF/services/org.keycloak.provider.Spi deleted file mode 100644 index 4ba538b97d..0000000000 --- a/forms/common-freemarker/src/main/resources/META-INF/services/org.keycloak.provider.Spi +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.freemarker.ThemeSpi \ No newline at end of file diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml index 7baa59094a..a3e47cc16b 100755 --- a/forms/common-themes/pom.xml +++ b/forms/common-themes/pom.xml @@ -24,11 +24,6 @@ keycloak-server-spi provided - - org.keycloak - keycloak-forms-common-freemarker - provided - org.jboss.spec.javax.ws.rs jboss-jaxrs-api_2.0_spec diff --git a/forms/email-freemarker/pom.xml b/forms/email-freemarker/pom.xml deleted file mode 100755 index 8d533cd51d..0000000000 --- a/forms/email-freemarker/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - keycloak-forms-parent - org.keycloak - 1.9.0.CR1-SNAPSHOT - ../pom.xml - - 4.0.0 - - keycloak-email-freemarker - Keycloak Email FreeMarker - - - - - org.keycloak - keycloak-core - provided - - - org.keycloak - keycloak-server-spi - provided - - - org.keycloak - keycloak-services - provided - - - org.keycloak - keycloak-forms-common-freemarker - provided - - - org.jboss.logging - jboss-logging - provided - - - org.freemarker - freemarker - provided - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - - diff --git a/forms/login-freemarker/pom.xml b/forms/login-freemarker/pom.xml deleted file mode 100755 index b3800608de..0000000000 --- a/forms/login-freemarker/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - keycloak-forms-parent - org.keycloak - 1.9.0.CR1-SNAPSHOT - ../pom.xml - - 4.0.0 - - keycloak-login-freemarker - Keycloak Login FreeMarker - - - - - org.keycloak - keycloak-core - provided - - - org.keycloak - keycloak-forms-common-freemarker - provided - - - org.keycloak - keycloak-server-spi - provided - - - org.keycloak - keycloak-services - provided - - - org.jboss.resteasy - resteasy-jaxrs - provided - - - org.freemarker - freemarker - provided - - - org.jboss.logging - jboss-logging - provided - - - - junit - junit - test - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - - diff --git a/forms/login-freemarker/src/main/resources/META-INF/services/org.keycloak.forms.login.LoginFormsProviderFactory b/forms/login-freemarker/src/main/resources/META-INF/services/org.keycloak.forms.login.LoginFormsProviderFactory deleted file mode 100644 index 893783b0d8..0000000000 --- a/forms/login-freemarker/src/main/resources/META-INF/services/org.keycloak.forms.login.LoginFormsProviderFactory +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.login.freemarker.FreeMarkerLoginFormsProviderFactory \ No newline at end of file diff --git a/forms/pom.xml b/forms/pom.xml index 0a1227c077..0fa081bc20 100755 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -15,11 +15,7 @@ - common-freemarker common-themes - account-freemarker - email-freemarker - login-freemarker diff --git a/pom.xml b/pom.xml index e55e5274b4..433d836e28 100755 --- a/pom.xml +++ b/pom.xml @@ -705,11 +705,6 @@ keycloak-ldap-federation ${project.version} - - org.keycloak - keycloak-account-freemarker - ${project.version} - org.keycloak keycloak-dependencies-server-min @@ -722,21 +717,11 @@ ${project.version} pom - - org.keycloak - keycloak-forms-common-freemarker - ${project.version} - org.keycloak keycloak-forms-common-themes ${project.version} - - org.keycloak - keycloak-email-freemarker - ${project.version} - org.keycloak keycloak-adapter-spi @@ -937,11 +922,6 @@ keycloak-wildfly-extensions ${project.version} - - org.keycloak - keycloak-login-freemarker - ${project.version} - org.keycloak keycloak-server-spi diff --git a/saml/saml-protocol/pom.xml b/saml/saml-protocol/pom.xml index 73cd7ca126..6de012faed 100755 --- a/saml/saml-protocol/pom.xml +++ b/saml/saml-protocol/pom.xml @@ -43,11 +43,6 @@ keycloak-services provided - - org.keycloak - keycloak-forms-common-freemarker - provided - org.keycloak keycloak-server-spi diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/Theme.java b/server-spi/src/main/java/org/keycloak/theme/Theme.java old mode 100644 new mode 100755 similarity index 97% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/Theme.java rename to server-spi/src/main/java/org/keycloak/theme/Theme.java index 43107ce723..3f5f89598c --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/Theme.java +++ b/server-spi/src/main/java/org/keycloak/theme/Theme.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker; +package org.keycloak.theme; import java.io.IOException; import java.io.InputStream; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeProvider.java b/server-spi/src/main/java/org/keycloak/theme/ThemeProvider.java old mode 100644 new mode 100755 similarity index 93% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeProvider.java rename to server-spi/src/main/java/org/keycloak/theme/ThemeProvider.java index 3c335d5f51..c202df313c --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeProvider.java +++ b/server-spi/src/main/java/org/keycloak/theme/ThemeProvider.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker; +package org.keycloak.theme; import org.keycloak.provider.Provider; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeProviderFactory.java b/server-spi/src/main/java/org/keycloak/theme/ThemeProviderFactory.java old mode 100644 new mode 100755 similarity index 86% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeProviderFactory.java rename to server-spi/src/main/java/org/keycloak/theme/ThemeProviderFactory.java index 26ce238f9e..e6b5874c93 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeProviderFactory.java +++ b/server-spi/src/main/java/org/keycloak/theme/ThemeProviderFactory.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker; +package org.keycloak.theme; import org.keycloak.provider.ProviderFactory; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeSpi.java b/server-spi/src/main/java/org/keycloak/theme/ThemeSpi.java old mode 100644 new mode 100755 similarity index 95% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeSpi.java rename to server-spi/src/main/java/org/keycloak/theme/ThemeSpi.java index 9e97cb9f9d..16d46feaa3 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeSpi.java +++ b/server-spi/src/main/java/org/keycloak/theme/ThemeSpi.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker; +package org.keycloak.theme; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; diff --git a/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi index 653074c47e..b72f756979 100755 --- a/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi +++ b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi @@ -22,4 +22,5 @@ org.keycloak.forms.account.AccountSpi org.keycloak.forms.login.LoginFormsSpi org.keycloak.email.EmailSenderSpi org.keycloak.email.EmailTemplateSpi +org.keycloak.theme.ThemeSpi diff --git a/services/pom.xml b/services/pom.xml index 915d04b0ce..9385b0bae0 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -35,8 +35,9 @@ keycloak-connections-http-client - org.keycloak - keycloak-forms-common-freemarker + org.freemarker + freemarker + provided javax.mail diff --git a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java b/services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java similarity index 96% rename from forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java rename to services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java index 0a4785188b..c8e741d9f0 100755 --- a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java +++ b/services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java @@ -9,11 +9,11 @@ import org.keycloak.email.freemarker.beans.EventBean; import org.keycloak.email.freemarker.beans.ProfileBean; import org.keycloak.events.Event; import org.keycloak.events.EventType; -import org.keycloak.freemarker.FreeMarkerException; -import org.keycloak.freemarker.FreeMarkerUtil; -import org.keycloak.freemarker.Theme; -import org.keycloak.freemarker.ThemeProvider; -import org.keycloak.freemarker.beans.MessageFormatterMethod; +import org.keycloak.theme.FreeMarkerException; +import org.keycloak.theme.FreeMarkerUtil; +import org.keycloak.theme.Theme; +import org.keycloak.theme.ThemeProvider; +import org.keycloak.theme.beans.MessageFormatterMethod; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; diff --git a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProviderFactory.java b/services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProviderFactory.java similarity index 95% rename from forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProviderFactory.java rename to services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProviderFactory.java index db0d9f2a1a..ea955294ed 100755 --- a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProviderFactory.java +++ b/services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProviderFactory.java @@ -3,7 +3,7 @@ package org.keycloak.email.freemarker; import org.keycloak.Config; import org.keycloak.email.EmailTemplateProvider; import org.keycloak.email.EmailTemplateProviderFactory; -import org.keycloak.freemarker.FreeMarkerUtil; +import org.keycloak.theme.FreeMarkerUtil; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/AdminEventBean.java b/services/src/main/java/org/keycloak/email/freemarker/beans/AdminEventBean.java similarity index 100% rename from forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/AdminEventBean.java rename to services/src/main/java/org/keycloak/email/freemarker/beans/AdminEventBean.java diff --git a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/EventBean.java b/services/src/main/java/org/keycloak/email/freemarker/beans/EventBean.java similarity index 100% rename from forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/EventBean.java rename to services/src/main/java/org/keycloak/email/freemarker/beans/EventBean.java diff --git a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java b/services/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java similarity index 100% rename from forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java rename to services/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java b/services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java similarity index 95% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java index 8cc9de6869..a7f0614ac3 100755 --- a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java +++ b/services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java @@ -48,17 +48,17 @@ import org.keycloak.forms.account.freemarker.model.SessionsBean; import org.keycloak.forms.account.freemarker.model.TotpBean; import org.keycloak.forms.account.freemarker.model.UrlBean; import org.keycloak.events.Event; -import org.keycloak.freemarker.BrowserSecurityHeaderSetup; -import org.keycloak.freemarker.FreeMarkerException; -import org.keycloak.freemarker.FreeMarkerUtil; -import org.keycloak.freemarker.Theme; -import org.keycloak.freemarker.ThemeProvider; -import org.keycloak.freemarker.beans.AdvancedMessageFormatterMethod; -import org.keycloak.freemarker.beans.LocaleBean; -import org.keycloak.freemarker.beans.MessageBean; -import org.keycloak.freemarker.beans.MessageFormatterMethod; -import org.keycloak.freemarker.beans.MessageType; -import org.keycloak.freemarker.beans.MessagesPerFieldBean; +import org.keycloak.theme.BrowserSecurityHeaderSetup; +import org.keycloak.theme.FreeMarkerException; +import org.keycloak.theme.FreeMarkerUtil; +import org.keycloak.theme.Theme; +import org.keycloak.theme.ThemeProvider; +import org.keycloak.theme.beans.AdvancedMessageFormatterMethod; +import org.keycloak.theme.beans.LocaleBean; +import org.keycloak.theme.beans.MessageBean; +import org.keycloak.theme.beans.MessageFormatterMethod; +import org.keycloak.theme.beans.MessageType; +import org.keycloak.theme.beans.MessagesPerFieldBean; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProviderFactory.java b/services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProviderFactory.java similarity index 95% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProviderFactory.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProviderFactory.java index df4e3cb68a..3ffca47e7e 100755 --- a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProviderFactory.java +++ b/services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProviderFactory.java @@ -3,7 +3,7 @@ package org.keycloak.forms.account.freemarker; import org.keycloak.Config; import org.keycloak.forms.account.AccountProvider; import org.keycloak.forms.account.AccountProviderFactory; -import org.keycloak.freemarker.FreeMarkerUtil; +import org.keycloak.theme.FreeMarkerUtil; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/Templates.java b/services/src/main/java/org/keycloak/forms/account/freemarker/Templates.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/Templates.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/Templates.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/AccountFederatedIdentityBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountFederatedIdentityBean.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/AccountFederatedIdentityBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountFederatedIdentityBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/ApplicationsBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/ApplicationsBean.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/ApplicationsBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/ApplicationsBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/FeaturesBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/FeaturesBean.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/FeaturesBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/FeaturesBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/LogBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/LogBean.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/LogBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/LogBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/PasswordBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/PasswordBean.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/PasswordBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/PasswordBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/RealmBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/RealmBean.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/RealmBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/RealmBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/ReferrerBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/ReferrerBean.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/ReferrerBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/ReferrerBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/TotpBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/TotpBean.java similarity index 100% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/TotpBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/TotpBean.java diff --git a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/UrlBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/UrlBean.java similarity index 98% rename from forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/UrlBean.java rename to services/src/main/java/org/keycloak/forms/account/freemarker/model/UrlBean.java index c7be98274a..6eec0a9679 100755 --- a/forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/UrlBean.java +++ b/services/src/main/java/org/keycloak/forms/account/freemarker/model/UrlBean.java @@ -1,6 +1,6 @@ package org.keycloak.forms.account.freemarker.model; -import org.keycloak.freemarker.Theme; +import org.keycloak.theme.Theme; import org.keycloak.models.RealmModel; import org.keycloak.services.Urls; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/AuthenticatorConfiguredMethod.java b/services/src/main/java/org/keycloak/forms/login/freemarker/AuthenticatorConfiguredMethod.java similarity index 95% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/AuthenticatorConfiguredMethod.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/AuthenticatorConfiguredMethod.java index 222252e791..74c64134a2 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/AuthenticatorConfiguredMethod.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/AuthenticatorConfiguredMethod.java @@ -1,4 +1,4 @@ -package org.keycloak.login.freemarker; +package org.keycloak.forms.login.freemarker; import freemarker.template.TemplateMethodModelEx; import freemarker.template.TemplateModelException; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java b/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java similarity index 94% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java index 6a0c06a833..6f1047da89 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.keycloak.login.freemarker; +package org.keycloak.forms.login.freemarker; import org.jboss.logging.Logger; import org.jboss.resteasy.specimpl.MultivaluedMapImpl; @@ -25,30 +25,30 @@ import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.common.util.ObjectUtil; import org.keycloak.email.EmailException; import org.keycloak.email.EmailTemplateProvider; -import org.keycloak.freemarker.BrowserSecurityHeaderSetup; -import org.keycloak.freemarker.FreeMarkerException; -import org.keycloak.freemarker.FreeMarkerUtil; -import org.keycloak.freemarker.Theme; -import org.keycloak.freemarker.ThemeProvider; -import org.keycloak.freemarker.beans.AdvancedMessageFormatterMethod; -import org.keycloak.freemarker.beans.LocaleBean; -import org.keycloak.freemarker.beans.MessageBean; -import org.keycloak.freemarker.beans.MessageFormatterMethod; -import org.keycloak.freemarker.beans.MessageType; -import org.keycloak.freemarker.beans.MessagesPerFieldBean; +import org.keycloak.forms.login.freemarker.model.CodeBean; +import org.keycloak.forms.login.freemarker.model.UrlBean; +import org.keycloak.theme.BrowserSecurityHeaderSetup; +import org.keycloak.theme.FreeMarkerException; +import org.keycloak.theme.FreeMarkerUtil; +import org.keycloak.theme.Theme; +import org.keycloak.theme.ThemeProvider; +import org.keycloak.theme.beans.AdvancedMessageFormatterMethod; +import org.keycloak.theme.beans.LocaleBean; +import org.keycloak.theme.beans.MessageBean; +import org.keycloak.theme.beans.MessageFormatterMethod; +import org.keycloak.theme.beans.MessageType; +import org.keycloak.theme.beans.MessagesPerFieldBean; import org.keycloak.forms.login.LoginFormsPages; import org.keycloak.forms.login.LoginFormsProvider; -import org.keycloak.login.freemarker.model.ClientBean; -import org.keycloak.login.freemarker.model.CodeBean; -import org.keycloak.login.freemarker.model.IdentityProviderBean; -import org.keycloak.login.freemarker.model.LoginBean; -import org.keycloak.login.freemarker.model.OAuthGrantBean; -import org.keycloak.login.freemarker.model.ProfileBean; -import org.keycloak.login.freemarker.model.RealmBean; -import org.keycloak.login.freemarker.model.RegisterBean; -import org.keycloak.login.freemarker.model.RequiredActionUrlFormatterMethod; -import org.keycloak.login.freemarker.model.TotpBean; -import org.keycloak.login.freemarker.model.UrlBean; +import org.keycloak.forms.login.freemarker.model.ClientBean; +import org.keycloak.forms.login.freemarker.model.IdentityProviderBean; +import org.keycloak.forms.login.freemarker.model.LoginBean; +import org.keycloak.forms.login.freemarker.model.OAuthGrantBean; +import org.keycloak.forms.login.freemarker.model.ProfileBean; +import org.keycloak.forms.login.freemarker.model.RealmBean; +import org.keycloak.forms.login.freemarker.model.RegisterBean; +import org.keycloak.forms.login.freemarker.model.RequiredActionUrlFormatterMethod; +import org.keycloak.forms.login.freemarker.model.TotpBean; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.Constants; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProviderFactory.java b/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProviderFactory.java similarity index 91% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProviderFactory.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProviderFactory.java index b1d2a93c7d..200c1a39c6 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProviderFactory.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProviderFactory.java @@ -1,7 +1,7 @@ -package org.keycloak.login.freemarker; +package org.keycloak.forms.login.freemarker; import org.keycloak.Config; -import org.keycloak.freemarker.FreeMarkerUtil; +import org.keycloak.theme.FreeMarkerUtil; import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.forms.login.LoginFormsProviderFactory; import org.keycloak.models.KeycloakSession; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/LoginFormsUtil.java b/services/src/main/java/org/keycloak/forms/login/freemarker/LoginFormsUtil.java similarity index 98% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/LoginFormsUtil.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/LoginFormsUtil.java index 8e979e2588..2b9ab8eab0 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/LoginFormsUtil.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/LoginFormsUtil.java @@ -1,4 +1,4 @@ -package org.keycloak.login.freemarker; +package org.keycloak.forms.login.freemarker; import java.util.HashSet; import java.util.LinkedList; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java b/services/src/main/java/org/keycloak/forms/login/freemarker/Templates.java similarity index 96% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/Templates.java index 92812e1df2..e5a57d49f7 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/Templates.java @@ -1,4 +1,4 @@ -package org.keycloak.login.freemarker; +package org.keycloak.forms.login.freemarker; import org.keycloak.forms.login.LoginFormsPages; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/ClientBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/ClientBean.java similarity index 94% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/ClientBean.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/ClientBean.java index a29271895b..37b6aeb9ed 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/ClientBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/ClientBean.java @@ -1,4 +1,4 @@ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; import org.keycloak.models.ClientModel; import org.keycloak.services.util.ResolveRelative; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/CodeBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/CodeBean.java old mode 100644 new mode 100755 similarity index 90% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/CodeBean.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/CodeBean.java index 8851f9eade..66c24a9b84 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/CodeBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/CodeBean.java @@ -1,4 +1,4 @@ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; /** * @author Stian Thorgersen diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/IdentityProviderBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/IdentityProviderBean.java similarity index 98% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/IdentityProviderBean.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/IdentityProviderBean.java index 4d4f1e3fc1..af444db090 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/IdentityProviderBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/IdentityProviderBean.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.RealmModel; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/LoginBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/LoginBean.java similarity index 97% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/LoginBean.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/LoginBean.java index c5e30488d2..51524d94f6 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/LoginBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/LoginBean.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; import javax.ws.rs.core.MultivaluedMap; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/OAuthGrantBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/OAuthGrantBean.java similarity index 98% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/OAuthGrantBean.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/OAuthGrantBean.java index ceb5b86538..5864ea3fb2 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/OAuthGrantBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/OAuthGrantBean.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; import org.jboss.resteasy.specimpl.MultivaluedMapImpl; import org.keycloak.models.ClientModel; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/ProfileBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java similarity index 98% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/ProfileBean.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java index 0783529ee5..25e1a8e1d6 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/ProfileBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; import java.util.HashMap; import java.util.List; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RealmBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RealmBean.java similarity index 98% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RealmBean.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/RealmBean.java index 38b21f9bd1..d9e1d57a0b 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RealmBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RealmBean.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; import org.keycloak.models.RealmModel; import org.keycloak.models.RequiredCredentialModel; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RegisterBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java similarity index 97% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RegisterBean.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java index 362951e78a..590e827ae0 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RegisterBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; import javax.ws.rs.core.MultivaluedMap; import java.util.HashMap; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RequiredActionUrlFormatterMethod.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RequiredActionUrlFormatterMethod.java similarity index 94% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RequiredActionUrlFormatterMethod.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/RequiredActionUrlFormatterMethod.java index 7a39a10368..40927c84fc 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RequiredActionUrlFormatterMethod.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RequiredActionUrlFormatterMethod.java @@ -1,4 +1,4 @@ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; import freemarker.template.TemplateMethodModelEx; import freemarker.template.TemplateModelException; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/TotpBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java similarity index 98% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/TotpBean.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java index eae56dc39e..86222c0e8f 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/TotpBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/UrlBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java similarity index 97% rename from forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/UrlBean.java rename to services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java index ff83c43b4b..64e439ba4d 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/UrlBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java @@ -19,9 +19,9 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.login.freemarker.model; +package org.keycloak.forms.login.freemarker.model; -import org.keycloak.freemarker.Theme; +import org.keycloak.theme.Theme; import org.keycloak.models.RealmModel; import org.keycloak.services.Urls; diff --git a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java index c9b3c6c185..1bc5f49b02 100755 --- a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java @@ -2,8 +2,8 @@ package org.keycloak.services.resources; import org.jboss.logging.Logger; import org.keycloak.common.Version; -import org.keycloak.freemarker.Theme; -import org.keycloak.freemarker.ThemeProvider; +import org.keycloak.theme.Theme; +import org.keycloak.theme.ThemeProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.common.util.MimeTypeUtil; import org.keycloak.services.util.CacheControlUtil; diff --git a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java index 3e6bf3668e..9b0dfac03c 100755 --- a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java @@ -2,9 +2,9 @@ package org.keycloak.services.resources; import org.jboss.logging.Logger; import org.keycloak.Config; -import org.keycloak.freemarker.FreeMarkerUtil; -import org.keycloak.freemarker.Theme; -import org.keycloak.freemarker.ThemeProvider; +import org.keycloak.theme.FreeMarkerUtil; +import org.keycloak.theme.Theme; +import org.keycloak.theme.ThemeProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.common.util.MimeTypeUtil; import org.keycloak.services.managers.ApplianceBootstrap; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java index 89927f34c9..bf1a69bae7 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java @@ -8,11 +8,11 @@ import org.jboss.resteasy.spi.HttpResponse; import org.jboss.resteasy.spi.NotFoundException; import org.keycloak.common.ClientConnection; import org.keycloak.common.Version; -import org.keycloak.freemarker.BrowserSecurityHeaderSetup; -import org.keycloak.freemarker.FreeMarkerException; -import org.keycloak.freemarker.FreeMarkerUtil; -import org.keycloak.freemarker.Theme; -import org.keycloak.freemarker.ThemeProvider; +import org.keycloak.theme.BrowserSecurityHeaderSetup; +import org.keycloak.theme.FreeMarkerException; +import org.keycloak.theme.FreeMarkerUtil; +import org.keycloak.theme.Theme; +import org.keycloak.theme.ThemeProvider; import org.keycloak.models.AdminRoles; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java index 624b38f9ca..cd288b7e18 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java @@ -16,8 +16,8 @@ import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; import org.keycloak.events.EventType; import org.keycloak.events.admin.OperationType; -import org.keycloak.freemarker.Theme; -import org.keycloak.freemarker.ThemeProvider; +import org.keycloak.theme.Theme; +import org.keycloak.theme.ThemeProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.utils.ModelToRepresentation; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/BrowserSecurityHeaderSetup.java b/services/src/main/java/org/keycloak/theme/BrowserSecurityHeaderSetup.java similarity index 95% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/BrowserSecurityHeaderSetup.java rename to services/src/main/java/org/keycloak/theme/BrowserSecurityHeaderSetup.java index 1fb954eef4..efb23d5421 100755 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/BrowserSecurityHeaderSetup.java +++ b/services/src/main/java/org/keycloak/theme/BrowserSecurityHeaderSetup.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker; +package org.keycloak.theme; import org.keycloak.models.BrowserSecurityHeaders; import org.keycloak.models.RealmModel; diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/ClassLoaderTheme.java b/services/src/main/java/org/keycloak/theme/ClassLoaderTheme.java similarity index 98% rename from forms/common-themes/src/main/java/org/keycloak/theme/ClassLoaderTheme.java rename to services/src/main/java/org/keycloak/theme/ClassLoaderTheme.java index 68ac7caca1..5be5a5e45e 100755 --- a/forms/common-themes/src/main/java/org/keycloak/theme/ClassLoaderTheme.java +++ b/services/src/main/java/org/keycloak/theme/ClassLoaderTheme.java @@ -1,7 +1,5 @@ package org.keycloak.theme; -import org.keycloak.freemarker.Theme; - import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManager.java b/services/src/main/java/org/keycloak/theme/ExtendingThemeManager.java old mode 100644 new mode 100755 similarity index 99% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManager.java rename to services/src/main/java/org/keycloak/theme/ExtendingThemeManager.java index 0a253d1fb9..41e95df446 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManager.java +++ b/services/src/main/java/org/keycloak/theme/ExtendingThemeManager.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker; +package org.keycloak.theme; import org.jboss.logging.Logger; import org.keycloak.Config; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManagerFactory.java b/services/src/main/java/org/keycloak/theme/ExtendingThemeManagerFactory.java similarity index 98% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManagerFactory.java rename to services/src/main/java/org/keycloak/theme/ExtendingThemeManagerFactory.java index 42fa50e361..9417a9c5de 100755 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManagerFactory.java +++ b/services/src/main/java/org/keycloak/theme/ExtendingThemeManagerFactory.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker; +package org.keycloak.theme; import org.keycloak.Config; import org.keycloak.models.KeycloakSession; diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/FolderTheme.java b/services/src/main/java/org/keycloak/theme/FolderTheme.java old mode 100644 new mode 100755 similarity index 98% rename from forms/common-themes/src/main/java/org/keycloak/theme/FolderTheme.java rename to services/src/main/java/org/keycloak/theme/FolderTheme.java index 77a65a8e59..83f9838359 --- a/forms/common-themes/src/main/java/org/keycloak/theme/FolderTheme.java +++ b/services/src/main/java/org/keycloak/theme/FolderTheme.java @@ -1,7 +1,5 @@ package org.keycloak.theme; -import org.keycloak.freemarker.Theme; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java b/services/src/main/java/org/keycloak/theme/FolderThemeProvider.java similarity index 95% rename from forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java rename to services/src/main/java/org/keycloak/theme/FolderThemeProvider.java index 90d8ba66bf..b21cd91bc4 100755 --- a/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java +++ b/services/src/main/java/org/keycloak/theme/FolderThemeProvider.java @@ -1,8 +1,5 @@ package org.keycloak.theme; -import org.keycloak.freemarker.Theme; -import org.keycloak.freemarker.ThemeProvider; - import java.io.File; import java.io.FileFilter; import java.io.IOException; diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java b/services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java similarity index 90% rename from forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java rename to services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java index a780643aa0..9308bfd11d 100755 --- a/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java +++ b/services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java @@ -1,8 +1,6 @@ package org.keycloak.theme; import org.keycloak.Config; -import org.keycloak.freemarker.ThemeProvider; -import org.keycloak.freemarker.ThemeProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerException.java b/services/src/main/java/org/keycloak/theme/FreeMarkerException.java old mode 100644 new mode 100755 similarity index 90% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerException.java rename to services/src/main/java/org/keycloak/theme/FreeMarkerException.java index 1af9b20b2a..b0bf5a59a2 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerException.java +++ b/services/src/main/java/org/keycloak/theme/FreeMarkerException.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker; +package org.keycloak.theme; /** * @author Stian Thorgersen diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerUtil.java b/services/src/main/java/org/keycloak/theme/FreeMarkerUtil.java similarity index 98% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerUtil.java rename to services/src/main/java/org/keycloak/theme/FreeMarkerUtil.java index e41d671c28..9f11a24dca 100755 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerUtil.java +++ b/services/src/main/java/org/keycloak/theme/FreeMarkerUtil.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker; +package org.keycloak.theme; import freemarker.cache.URLTemplateLoader; import freemarker.template.Configuration; diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProvider.java b/services/src/main/java/org/keycloak/theme/JarThemeProvider.java old mode 100644 new mode 100755 similarity index 93% rename from forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProvider.java rename to services/src/main/java/org/keycloak/theme/JarThemeProvider.java index 406f8c5ec6..ac712beed1 --- a/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProvider.java +++ b/services/src/main/java/org/keycloak/theme/JarThemeProvider.java @@ -1,8 +1,5 @@ package org.keycloak.theme; -import org.keycloak.freemarker.Theme; -import org.keycloak.freemarker.ThemeProvider; - import java.io.IOException; import java.util.Collections; import java.util.Map; diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java b/services/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java similarity index 95% rename from forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java rename to services/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java index 8f72e29dc1..97c7cc921b 100755 --- a/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java +++ b/services/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java @@ -1,9 +1,6 @@ package org.keycloak.theme; import org.keycloak.Config; -import org.keycloak.freemarker.Theme; -import org.keycloak.freemarker.ThemeProvider; -import org.keycloak.freemarker.ThemeProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.util.JsonSerialization; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/AdvancedMessageFormatterMethod.java b/services/src/main/java/org/keycloak/theme/beans/AdvancedMessageFormatterMethod.java old mode 100644 new mode 100755 similarity index 96% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/AdvancedMessageFormatterMethod.java rename to services/src/main/java/org/keycloak/theme/beans/AdvancedMessageFormatterMethod.java index 007d445e88..a7be1dc88d --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/AdvancedMessageFormatterMethod.java +++ b/services/src/main/java/org/keycloak/theme/beans/AdvancedMessageFormatterMethod.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker.beans; +package org.keycloak.theme.beans; import freemarker.template.TemplateMethodModelEx; import freemarker.template.TemplateModelException; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/LocaleBean.java b/services/src/main/java/org/keycloak/theme/beans/LocaleBean.java old mode 100644 new mode 100755 similarity index 97% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/LocaleBean.java rename to services/src/main/java/org/keycloak/theme/beans/LocaleBean.java index aedf33e3c4..ea486bda91 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/LocaleBean.java +++ b/services/src/main/java/org/keycloak/theme/beans/LocaleBean.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker.beans; +package org.keycloak.theme.beans; import org.keycloak.models.RealmModel; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageBean.java b/services/src/main/java/org/keycloak/theme/beans/MessageBean.java old mode 100644 new mode 100755 similarity index 98% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageBean.java rename to services/src/main/java/org/keycloak/theme/beans/MessageBean.java index 7cfe9b8fb6..843ac0a08a --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageBean.java +++ b/services/src/main/java/org/keycloak/theme/beans/MessageBean.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.freemarker.beans; +package org.keycloak.theme.beans; /** * @author Stian Thorgersen diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageFormatterMethod.java b/services/src/main/java/org/keycloak/theme/beans/MessageFormatterMethod.java old mode 100644 new mode 100755 similarity index 95% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageFormatterMethod.java rename to services/src/main/java/org/keycloak/theme/beans/MessageFormatterMethod.java index db57676a9f..bf3923dba9 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageFormatterMethod.java +++ b/services/src/main/java/org/keycloak/theme/beans/MessageFormatterMethod.java @@ -1,4 +1,4 @@ -package org.keycloak.freemarker.beans; +package org.keycloak.theme.beans; import freemarker.template.TemplateMethodModelEx; import freemarker.template.TemplateModelException; diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageType.java b/services/src/main/java/org/keycloak/theme/beans/MessageType.java old mode 100644 new mode 100755 similarity index 89% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageType.java rename to services/src/main/java/org/keycloak/theme/beans/MessageType.java index 12ec23cdba..5c5f333210 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageType.java +++ b/services/src/main/java/org/keycloak/theme/beans/MessageType.java @@ -3,7 +3,7 @@ * Copyright 2015 Red Hat Inc. and/or its affiliates and other contributors * as indicated by the @authors tag. All rights reserved. */ -package org.keycloak.freemarker.beans; +package org.keycloak.theme.beans; /** * Enum with types of messages. diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessagesPerFieldBean.java b/services/src/main/java/org/keycloak/theme/beans/MessagesPerFieldBean.java old mode 100644 new mode 100755 similarity index 98% rename from forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessagesPerFieldBean.java rename to services/src/main/java/org/keycloak/theme/beans/MessagesPerFieldBean.java index 5858b07028..d5308cb5f0 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessagesPerFieldBean.java +++ b/services/src/main/java/org/keycloak/theme/beans/MessagesPerFieldBean.java @@ -3,7 +3,7 @@ * Copyright 2015 Red Hat Inc. and/or its affiliates and other contributors * as indicated by the @authors tag. All rights reserved. */ -package org.keycloak.freemarker.beans; +package org.keycloak.theme.beans; import java.util.HashMap; import java.util.Map; diff --git a/forms/email-freemarker/src/main/resources/META-INF/services/org.keycloak.email.EmailTemplateProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.email.EmailTemplateProviderFactory similarity index 100% rename from forms/email-freemarker/src/main/resources/META-INF/services/org.keycloak.email.EmailTemplateProviderFactory rename to services/src/main/resources/META-INF/services/org.keycloak.email.EmailTemplateProviderFactory diff --git a/forms/account-freemarker/src/main/resources/META-INF/services/org.keycloak.forms.account.AccountProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.forms.account.AccountProviderFactory similarity index 100% rename from forms/account-freemarker/src/main/resources/META-INF/services/org.keycloak.forms.account.AccountProviderFactory rename to services/src/main/resources/META-INF/services/org.keycloak.forms.account.AccountProviderFactory diff --git a/services/src/main/resources/META-INF/services/org.keycloak.forms.login.LoginFormsProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.forms.login.LoginFormsProviderFactory new file mode 100755 index 0000000000..56e2351c33 --- /dev/null +++ b/services/src/main/resources/META-INF/services/org.keycloak.forms.login.LoginFormsProviderFactory @@ -0,0 +1 @@ +org.keycloak.forms.login.freemarker.FreeMarkerLoginFormsProviderFactory \ No newline at end of file diff --git a/forms/common-themes/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory old mode 100644 new mode 100755 similarity index 64% rename from forms/common-themes/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory rename to services/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory index ae680da049..64c3131609 --- a/forms/common-themes/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory +++ b/services/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory @@ -1,2 +1,3 @@ +org.keycloak.theme.ExtendingThemeManagerFactory org.keycloak.theme.JarThemeProviderFactory org.keycloak.theme.FolderThemeProviderFactory \ No newline at end of file diff --git a/forms/login-freemarker/src/test/java/org/keycloak/login/freemarker/model/IdentityProviderBeanTest.java b/services/src/test/java/org/keycloak/test/login/freemarker/model/IdentityProviderBeanTest.java old mode 100644 new mode 100755 similarity index 86% rename from forms/login-freemarker/src/test/java/org/keycloak/login/freemarker/model/IdentityProviderBeanTest.java rename to services/src/test/java/org/keycloak/test/login/freemarker/model/IdentityProviderBeanTest.java index dda3316a13..d08b90b64f --- a/forms/login-freemarker/src/test/java/org/keycloak/login/freemarker/model/IdentityProviderBeanTest.java +++ b/services/src/test/java/org/keycloak/test/login/freemarker/model/IdentityProviderBeanTest.java @@ -3,15 +3,15 @@ * Copyright 2015 Red Hat Inc. and/or its affiliates and other contributors * as indicated by the @authors tag. All rights reserved. */ -package org.keycloak.login.freemarker.model; +package org.keycloak.test.login.freemarker.model; import org.junit.Assert; import org.junit.Test; -import org.keycloak.login.freemarker.model.IdentityProviderBean.IdentityProvider; -import org.keycloak.login.freemarker.model.IdentityProviderBean.IdentityProviderComparator; +import org.keycloak.forms.login.freemarker.model.IdentityProviderBean.IdentityProvider; +import org.keycloak.forms.login.freemarker.model.IdentityProviderBean.IdentityProviderComparator; /** - * Unit test for {@link IdentityProviderBean} + * Unit test for {@link org.keycloak.forms.login.freemarker.model.IdentityProviderBean} * * @author Vlastimil Elias (velias at redhat dot com) */ diff --git a/wildfly/extensions/pom.xml b/wildfly/extensions/pom.xml index 68189afae3..e0ece0a901 100755 --- a/wildfly/extensions/pom.xml +++ b/wildfly/extensions/pom.xml @@ -44,11 +44,6 @@ keycloak-server-spi provided - - org.keycloak - keycloak-forms-common-freemarker - provided - org.keycloak keycloak-forms-common-themes diff --git a/wildfly/extensions/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory b/wildfly/extensions/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory similarity index 100% rename from wildfly/extensions/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory rename to wildfly/extensions/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory