libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

reorg freemarker

Browse source
This commit is contained in:
Bill Burke 2016-01-19 11:33:59 -05:00
parent 65521864d4
commit 46634b386e
90 changed files with 97 additions and 526 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dependencies/server-min/pom.xml vendored
View file

@ -61,10 +61,6 @@
</dependency>
<!-- forms -->
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-freemarker</artifactId>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@ -73,19 +69,6 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-themes</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-account-freemarker</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-email-freemarker</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-login-freemarker</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-connections-truststore</artifactId>

22
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml
View file

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-account-freemarker">
<resources>
<artifact name="${org.keycloak:keycloak-account-freemarker}"/>
</resources>
<dependencies>
<module name="org.keycloak.keycloak-forms-common-freemarker"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-services"/>
<module name="javax.ws.rs.api"/>
<module name="org.jboss.logging"/>
<module name="org.freemarker"/>
<module name="javax.api"/>
<module name="javax.ws.rs.api"/>
</dependencies>
</module>

21
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml
View file

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-email-freemarker">
<resources>
<artifact name="${org.keycloak:keycloak-email-freemarker}"/>
</resources>
<dependencies>
<module name="org.keycloak.keycloak-forms-common-freemarker"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-services"/>
<module name="javax.ws.rs.api"/>
<module name="org.jboss.logging"/>
<module name="org.freemarker"/>
<module name="javax.api"/>
</dependencies>
</module>

19
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml
View file

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-forms-common-freemarker">
<resources>
<artifact name="${org.keycloak:keycloak-forms-common-freemarker}"/>
</resources>
<dependencies>
<module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.keycloak.keycloak-core"/>
<module name="javax.ws.rs.api"/>
<module name="org.jboss.logging"/>
<module name="org.freemarker"/>
<module name="javax.api"/>
</dependencies>
</module>

1
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-themes/main/module.xml
View file

@ -8,7 +8,6 @@
</resources>
<dependencies>
<module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-forms-common-freemarker"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.keycloak.keycloak-core"/>
<module name="javax.ws.rs.api"/>

23
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml
View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-login-freemarker">
<resources>
<artifact name="${org.keycloak:keycloak-login-freemarker}"/>
</resources>
<dependencies>
<module name="org.keycloak.keycloak-forms-common-freemarker"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-services"/>
<module name="javax.ws.rs.api"/>
<module name="org.jboss.logging"/>
<module name="org.freemarker"/>
<module name="javax.api"/>
<module name="javax.ws.rs.api"/>
<module name="org.jboss.resteasy.resteasy-jaxrs"/>
</dependencies>
</module>

1
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml
View file

@ -12,7 +12,6 @@
<module name="org.keycloak.keycloak-saml-core"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.keycloak.keycloak-services"/>
<module name="org.keycloak.keycloak-forms-common-freemarker"/>
<module name="org.apache.httpcomponents" />
<module name="org.jboss.logging"/>
<module name="javax.ws.rs.api"/>

4
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
View file

@ -1,7 +1,6 @@
<jboss-deployment-structure>
<deployment>
<dependencies>
<module name="org.keycloak.keycloak-account-freemarker" services="import"/>
<module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
<module name="org.keycloak.keycloak-connections-jpa" services="import" meta-inf="import"/>
<module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
@ -10,19 +9,16 @@
<module name="org.keycloak.keycloak-connections-truststore" services="import"/>
<module name="org.keycloak.keycloak-common" services="import"/>
<module name="org.keycloak.keycloak-core" services="import"/>
<module name="org.keycloak.keycloak-email-freemarker" services="import"/>
<module name="org.keycloak.keycloak-events-email" services="import"/>
<module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
<module name="org.keycloak.keycloak-events-jpa" services="import"/>
<module name="org.keycloak.keycloak-events-mongo" services="import"/>
<module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
<module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
<module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>
<module name="org.keycloak.keycloak-invalidation-cache-model" services="import"/>
<module name="org.keycloak.keycloak-js-adapter" services="import"/>
<module name="org.keycloak.keycloak-kerberos-federation" services="import"/>
<module name="org.keycloak.keycloak-ldap-federation" services="import"/>
<module name="org.keycloak.keycloak-login-freemarker" services="import"/>
<module name="org.keycloak.keycloak-server-spi" services="import"/>
<module name="org.keycloak.keycloak-model-jpa" services="import"/>
<module name="org.keycloak.keycloak-model-mongo" services="import"/>

5
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
View file

@ -7,7 +7,6 @@
<artifact name="${org.keycloak:keycloak-services}"/>
</resources>
<dependencies>
<module name="org.keycloak.keycloak-account-freemarker" services="import"/>
<module name="org.keycloak.keycloak-broker-oidc" services="import"/>
<module name="org.keycloak.keycloak-broker-saml" services="import"/>
<module name="org.keycloak.keycloak-connections-http-client" services="import"/>
@ -19,19 +18,16 @@
<module name="org.keycloak.keycloak-connections-truststore" services="import"/>
<module name="org.keycloak.keycloak-common" services="import"/>
<module name="org.keycloak.keycloak-core" services="import"/>
<module name="org.keycloak.keycloak-email-freemarker" services="import"/>
<module name="org.keycloak.keycloak-events-email" services="import"/>
<module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
<module name="org.keycloak.keycloak-events-jpa" services="import"/>
<module name="org.keycloak.keycloak-events-mongo" services="import"/>
<module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
<module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
<module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>
<module name="org.keycloak.keycloak-invalidation-cache-model" services="import"/>
<module name="org.keycloak.keycloak-js-adapter" services="import"/>
<module name="org.keycloak.keycloak-kerberos-federation" services="import"/>
<module name="org.keycloak.keycloak-ldap-federation" services="import"/>
<module name="org.keycloak.keycloak-login-freemarker" services="import"/>
<module name="org.keycloak.keycloak-server-spi" services="import"/>
<module name="org.keycloak.keycloak-model-jpa" services="import"/>
<module name="org.keycloak.keycloak-model-mongo" services="import"/>
@ -47,6 +43,7 @@
<module name="org.keycloak.keycloak-social-stackoverflow" services="import"/>
<module name="org.keycloak.keycloak-wildfly-extensions" services="import"/>
<module name="org.freemarker"/>
<module name="javax.ws.rs.api"/>
<module name="javax.mail.api"/>
<module name="org.jboss.resteasy.resteasy-jaxrs"/>

1
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-extensions/main/module.xml
View file

@ -8,7 +8,6 @@
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.keycloak.keycloak-services"/>
<module name="org.keycloak.keycloak-forms-common-freemarker"/>
<module name="org.keycloak.keycloak-forms-common-themes"/>
<module name="org.jboss.modules"/>
</dependencies>

67
forms/account-freemarker/pom.xml
View file

@ -1,67 +0,0 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-account-freemarker</artifactId>
<name>Keycloak Account Management FreeMarker</name>
<description />
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-freemarker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-services</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

62
forms/common-freemarker/pom.xml
View file

@ -1,62 +0,0 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-forms-common-freemarker</artifactId>
<name>Keycloak Forms Common FreeMarker</name>
<description />
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

1
forms/common-freemarker/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory
View file

@ -1 +0,0 @@
org.keycloak.freemarker.ExtendingThemeManagerFactory

1
forms/common-freemarker/src/main/resources/META-INF/services/org.keycloak.provider.Spi
View file

@ -1 +0,0 @@
org.keycloak.freemarker.ThemeSpi

5
forms/common-themes/pom.xml
View file

@ -24,11 +24,6 @@
<artifactId>keycloak-server-spi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-freemarker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>

62
forms/email-freemarker/pom.xml
View file

@ -1,62 +0,0 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-email-freemarker</artifactId>
<name>Keycloak Email FreeMarker</name>
<description/>
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-services</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-freemarker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

73
forms/login-freemarker/pom.xml
View file

@ -1,73 +0,0 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-login-freemarker</artifactId>
<name>Keycloak Login FreeMarker</name>
<description />
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-freemarker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-services</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

1
forms/login-freemarker/src/main/resources/META-INF/services/org.keycloak.forms.login.LoginFormsProviderFactory
View file

@ -1 +0,0 @@
org.keycloak.login.freemarker.FreeMarkerLoginFormsProviderFactory

4
forms/pom.xml
View file

@ -15,11 +15,7 @@
<description />
<modules>
<module>common-freemarker</module>
<module>common-themes</module>
<module>account-freemarker</module>
<module>email-freemarker</module>
<module>login-freemarker</module>
</modules>
</project>

20
pom.xml
View file

@ -705,11 +705,6 @@
<artifactId>keycloak-ldap-federation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-account-freemarker</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-dependencies-server-min</artifactId>
@ -722,21 +717,11 @@
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-freemarker</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-themes</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-email-freemarker</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-adapter-spi</artifactId>
@ -937,11 +922,6 @@
<artifactId>keycloak-wildfly-extensions</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-login-freemarker</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>

5
saml/saml-protocol/pom.xml
View file

@ -43,11 +43,6 @@
<artifactId>keycloak-services</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-freemarker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/Theme.java → server-spi/src/main/java/org/keycloak/theme/Theme.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker;
package org.keycloak.theme;
import java.io.IOException;
import java.io.InputStream;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeProvider.java → server-spi/src/main/java/org/keycloak/theme/ThemeProvider.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker;
package org.keycloak.theme;
import org.keycloak.provider.Provider;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeProviderFactory.java → server-spi/src/main/java/org/keycloak/theme/ThemeProviderFactory.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker;
package org.keycloak.theme;
import org.keycloak.provider.ProviderFactory;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeSpi.java → server-spi/src/main/java/org/keycloak/theme/ThemeSpi.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker;
package org.keycloak.theme;
import org.keycloak.provider.Provider;
import org.keycloak.provider.ProviderFactory;

1
server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
View file

@ -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

5
services/pom.xml
View file

@ -35,8 +35,9 @@
<artifactId>keycloak-connections-http-client</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-freemarker</artifactId>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>

10
forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java → services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java
View file

@ -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;

2
forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProviderFactory.java → services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProviderFactory.java
View file

@ -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;

0
forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/AdminEventBean.java → services/src/main/java/org/keycloak/email/freemarker/beans/AdminEventBean.java
View file

0
forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/EventBean.java → services/src/main/java/org/keycloak/email/freemarker/beans/EventBean.java
View file

0
forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java → services/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java
View file

22
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java → services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java
View file

@ -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;

2
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProviderFactory.java → services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProviderFactory.java
View file

@ -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;

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/Templates.java → services/src/main/java/org/keycloak/forms/account/freemarker/Templates.java
View file

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java
View file

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/AccountFederatedIdentityBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountFederatedIdentityBean.java
View file

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/ApplicationsBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/ApplicationsBean.java
View file

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/FeaturesBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/FeaturesBean.java
View file

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/LogBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/LogBean.java
View file

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/PasswordBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/PasswordBean.java
View file

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/RealmBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/RealmBean.java
View file

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/ReferrerBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/ReferrerBean.java
View file

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java
View file

0
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/TotpBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/TotpBean.java
View file

2
forms/account-freemarker/src/main/java/org/keycloak/forms/account/freemarker/model/UrlBean.java → services/src/main/java/org/keycloak/forms/account/freemarker/model/UrlBean.java
View file

@ -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;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/AuthenticatorConfiguredMethod.java → services/src/main/java/org/keycloak/forms/login/freemarker/AuthenticatorConfiguredMethod.java
View file

@ -1,4 +1,4 @@
package org.keycloak.login.freemarker;
package org.keycloak.forms.login.freemarker;
import freemarker.template.TemplateMethodModelEx;
import freemarker.template.TemplateModelException;

46
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java → services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java
View file

@ -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;

4
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProviderFactory.java → services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProviderFactory.java
View file

@ -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;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/LoginFormsUtil.java → services/src/main/java/org/keycloak/forms/login/freemarker/LoginFormsUtil.java
View file

@ -1,4 +1,4 @@
package org.keycloak.login.freemarker;
package org.keycloak.forms.login.freemarker;
import java.util.HashSet;
import java.util.LinkedList;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java → services/src/main/java/org/keycloak/forms/login/freemarker/Templates.java
View file

@ -1,4 +1,4 @@
package org.keycloak.login.freemarker;
package org.keycloak.forms.login.freemarker;
import org.keycloak.forms.login.LoginFormsPages;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/ClientBean.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/ClientBean.java
View file

@ -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;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/CodeBean.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/CodeBean.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.login.freemarker.model;
package org.keycloak.forms.login.freemarker.model;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/IdentityProviderBean.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/IdentityProviderBean.java
View file

@ -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;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/LoginBean.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/LoginBean.java
View file

@ -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;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/OAuthGrantBean.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/OAuthGrantBean.java
View file

@ -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;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/ProfileBean.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java
View file

@ -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;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RealmBean.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/RealmBean.java
View file

@ -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;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RegisterBean.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java
View file

@ -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;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RequiredActionUrlFormatterMethod.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/RequiredActionUrlFormatterMethod.java
View file

@ -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;

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/TotpBean.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java
View file

@ -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;

4
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/UrlBean.java → services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java
View file

@ -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;

4
services/src/main/java/org/keycloak/services/resources/ThemeResource.java
View file

@ -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;

6
services/src/main/java/org/keycloak/services/resources/WelcomeResource.java
View file

@ -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;

10
services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
View file

@ -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;

4
services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java
View file

@ -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;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/BrowserSecurityHeaderSetup.java → services/src/main/java/org/keycloak/theme/BrowserSecurityHeaderSetup.java
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker;
package org.keycloak.theme;
import org.keycloak.models.BrowserSecurityHeaders;
import org.keycloak.models.RealmModel;

2
forms/common-themes/src/main/java/org/keycloak/theme/ClassLoaderTheme.java → services/src/main/java/org/keycloak/theme/ClassLoaderTheme.java
View file

@ -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;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManager.java → services/src/main/java/org/keycloak/theme/ExtendingThemeManager.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker;
package org.keycloak.theme;
import org.jboss.logging.Logger;
import org.keycloak.Config;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManagerFactory.java → services/src/main/java/org/keycloak/theme/ExtendingThemeManagerFactory.java
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker;
package org.keycloak.theme;
import org.keycloak.Config;
import org.keycloak.models.KeycloakSession;

2
forms/common-themes/src/main/java/org/keycloak/theme/FolderTheme.java → services/src/main/java/org/keycloak/theme/FolderTheme.java Normal file → Executable file
View file

@ -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;

3
forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java → services/src/main/java/org/keycloak/theme/FolderThemeProvider.java
View file

@ -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;

2
forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java → services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java
View file

@ -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;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerException.java → services/src/main/java/org/keycloak/theme/FreeMarkerException.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker;
package org.keycloak.theme;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerUtil.java → services/src/main/java/org/keycloak/theme/FreeMarkerUtil.java
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker;
package org.keycloak.theme;
import freemarker.cache.URLTemplateLoader;
import freemarker.template.Configuration;

3
forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProvider.java → services/src/main/java/org/keycloak/theme/JarThemeProvider.java Normal file → Executable file
View file

@ -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;

3
forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java → services/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java
View file

@ -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;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/AdvancedMessageFormatterMethod.java → services/src/main/java/org/keycloak/theme/beans/AdvancedMessageFormatterMethod.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker.beans;
package org.keycloak.theme.beans;
import freemarker.template.TemplateMethodModelEx;
import freemarker.template.TemplateModelException;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/LocaleBean.java → services/src/main/java/org/keycloak/theme/beans/LocaleBean.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker.beans;
package org.keycloak.theme.beans;
import org.keycloak.models.RealmModel;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageBean.java → services/src/main/java/org/keycloak/theme/beans/MessageBean.java Normal file → Executable file
View file

@ -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 <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageFormatterMethod.java → services/src/main/java/org/keycloak/theme/beans/MessageFormatterMethod.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.freemarker.beans;
package org.keycloak.theme.beans;
import freemarker.template.TemplateMethodModelEx;
import freemarker.template.TemplateModelException;

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessageType.java → services/src/main/java/org/keycloak/theme/beans/MessageType.java Normal file → Executable file
View file

@ -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.

2
forms/common-freemarker/src/main/java/org/keycloak/freemarker/beans/MessagesPerFieldBean.java → services/src/main/java/org/keycloak/theme/beans/MessagesPerFieldBean.java Normal file → Executable file
View file

@ -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;

0
forms/email-freemarker/src/main/resources/META-INF/services/org.keycloak.email.EmailTemplateProviderFactory → services/src/main/resources/META-INF/services/org.keycloak.email.EmailTemplateProviderFactory
View file

0
forms/account-freemarker/src/main/resources/META-INF/services/org.keycloak.forms.account.AccountProviderFactory → services/src/main/resources/META-INF/services/org.keycloak.forms.account.AccountProviderFactory
View file

1
services/src/main/resources/META-INF/services/org.keycloak.forms.login.LoginFormsProviderFactory Executable file
View file

@ -0,0 +1 @@
org.keycloak.forms.login.freemarker.FreeMarkerLoginFormsProviderFactory

1
forms/common-themes/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory → services/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory Normal file → Executable file
View file

@ -1,2 +1,3 @@
org.keycloak.theme.ExtendingThemeManagerFactory
org.keycloak.theme.JarThemeProviderFactory
org.keycloak.theme.FolderThemeProviderFactory

8
forms/login-freemarker/src/test/java/org/keycloak/login/freemarker/model/IdentityProviderBeanTest.java → services/src/test/java/org/keycloak/test/login/freemarker/model/IdentityProviderBeanTest.java Normal file → Executable file
View file

@ -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)
*/

5
wildfly/extensions/pom.xml
View file

@ -44,11 +44,6 @@
<artifactId>keycloak-server-spi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-freemarker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-themes</artifactId>

0
wildfly/extensions/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory → wildfly/extensions/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory
View file