reorg freemarker

dependencies/server-min/pom.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

forms/account-freemarker/pom.xml

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

forms/common-freemarker/pom.xml

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

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

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

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

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

forms/common-themes/pom.xml

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

forms/email-freemarker/pom.xml

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

forms/login-freemarker/pom.xml

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

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

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

forms/pom.xml

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

pom.xml

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

saml/saml-protocol/pom.xml

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

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;

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;
 

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;
 

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;

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
 

services/pom.xml

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

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.theme.FreeMarkerException;
-import org.keycloak.freemarker.FreeMarkerUtil;
+import org.keycloak.theme.FreeMarkerUtil;
-import org.keycloak.freemarker.Theme;
+import org.keycloak.theme.Theme;
-import org.keycloak.freemarker.ThemeProvider;
+import org.keycloak.theme.ThemeProvider;
-import org.keycloak.freemarker.beans.MessageFormatterMethod;
+import org.keycloak.theme.beans.MessageFormatterMethod;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserModel;

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;
 

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.theme.BrowserSecurityHeaderSetup;
-import org.keycloak.freemarker.FreeMarkerException;
+import org.keycloak.theme.FreeMarkerException;
-import org.keycloak.freemarker.FreeMarkerUtil;
+import org.keycloak.theme.FreeMarkerUtil;
-import org.keycloak.freemarker.Theme;
+import org.keycloak.theme.Theme;
-import org.keycloak.freemarker.ThemeProvider;
+import org.keycloak.theme.ThemeProvider;
-import org.keycloak.freemarker.beans.AdvancedMessageFormatterMethod;
+import org.keycloak.theme.beans.AdvancedMessageFormatterMethod;
-import org.keycloak.freemarker.beans.LocaleBean;
+import org.keycloak.theme.beans.LocaleBean;
-import org.keycloak.freemarker.beans.MessageBean;
+import org.keycloak.theme.beans.MessageBean;
-import org.keycloak.freemarker.beans.MessageFormatterMethod;
+import org.keycloak.theme.beans.MessageFormatterMethod;
-import org.keycloak.freemarker.beans.MessageType;
+import org.keycloak.theme.beans.MessageType;
-import org.keycloak.freemarker.beans.MessagesPerFieldBean;
+import org.keycloak.theme.beans.MessagesPerFieldBean;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserModel;

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;
 

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;
 

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;

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.forms.login.freemarker.model.CodeBean;
-import org.keycloak.freemarker.FreeMarkerException;
+import org.keycloak.forms.login.freemarker.model.UrlBean;
-import org.keycloak.freemarker.FreeMarkerUtil;
+import org.keycloak.theme.BrowserSecurityHeaderSetup;
-import org.keycloak.freemarker.Theme;
+import org.keycloak.theme.FreeMarkerException;
-import org.keycloak.freemarker.ThemeProvider;
+import org.keycloak.theme.FreeMarkerUtil;
-import org.keycloak.freemarker.beans.AdvancedMessageFormatterMethod;
+import org.keycloak.theme.Theme;
-import org.keycloak.freemarker.beans.LocaleBean;
+import org.keycloak.theme.ThemeProvider;
-import org.keycloak.freemarker.beans.MessageBean;
+import org.keycloak.theme.beans.AdvancedMessageFormatterMethod;
-import org.keycloak.freemarker.beans.MessageFormatterMethod;
+import org.keycloak.theme.beans.LocaleBean;
-import org.keycloak.freemarker.beans.MessageType;
+import org.keycloak.theme.beans.MessageBean;
-import org.keycloak.freemarker.beans.MessagesPerFieldBean;
+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.forms.login.freemarker.model.ClientBean;
-import org.keycloak.login.freemarker.model.CodeBean;
+import org.keycloak.forms.login.freemarker.model.IdentityProviderBean;
-import org.keycloak.login.freemarker.model.IdentityProviderBean;
+import org.keycloak.forms.login.freemarker.model.LoginBean;
-import org.keycloak.login.freemarker.model.LoginBean;
+import org.keycloak.forms.login.freemarker.model.OAuthGrantBean;
-import org.keycloak.login.freemarker.model.OAuthGrantBean;
+import org.keycloak.forms.login.freemarker.model.ProfileBean;
-import org.keycloak.login.freemarker.model.ProfileBean;
+import org.keycloak.forms.login.freemarker.model.RealmBean;
-import org.keycloak.login.freemarker.model.RealmBean;
+import org.keycloak.forms.login.freemarker.model.RegisterBean;
-import org.keycloak.login.freemarker.model.RegisterBean;
+import org.keycloak.forms.login.freemarker.model.RequiredActionUrlFormatterMethod;
-import org.keycloak.login.freemarker.model.RequiredActionUrlFormatterMethod;
+import org.keycloak.forms.login.freemarker.model.TotpBean;
-import org.keycloak.login.freemarker.model.TotpBean;
-import org.keycloak.login.freemarker.model.UrlBean;
 import org.keycloak.models.ClientModel;
 import org.keycloak.models.ClientSessionModel;
 import org.keycloak.models.Constants;

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;

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;

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;
 

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;

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

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;

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;
 

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;

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;

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;

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;

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;

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;

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;
 

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.theme.Theme;
-import org.keycloak.freemarker.ThemeProvider;
+import org.keycloak.theme.ThemeProvider;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.common.util.MimeTypeUtil;
 import org.keycloak.services.util.CacheControlUtil;

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.theme.FreeMarkerUtil;
-import org.keycloak.freemarker.Theme;
+import org.keycloak.theme.Theme;
-import org.keycloak.freemarker.ThemeProvider;
+import org.keycloak.theme.ThemeProvider;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.common.util.MimeTypeUtil;
 import org.keycloak.services.managers.ApplianceBootstrap;

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.theme.BrowserSecurityHeaderSetup;
-import org.keycloak.freemarker.FreeMarkerException;
+import org.keycloak.theme.FreeMarkerException;
-import org.keycloak.freemarker.FreeMarkerUtil;
+import org.keycloak.theme.FreeMarkerUtil;
-import org.keycloak.freemarker.Theme;
+import org.keycloak.theme.Theme;
-import org.keycloak.freemarker.ThemeProvider;
+import org.keycloak.theme.ThemeProvider;
 import org.keycloak.models.AdminRoles;
 import org.keycloak.models.ClientModel;
 import org.keycloak.models.Constants;

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.theme.Theme;
-import org.keycloak.freemarker.ThemeProvider;
+import org.keycloak.theme.ThemeProvider;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.ProtocolMapperModel;
 import org.keycloak.models.utils.ModelToRepresentation;

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;

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;

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;

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;

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;

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;

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;
 

services/src/main/java/org/keycloak/theme/FreeMarkerException.java

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

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;

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;

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;

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;

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;
 

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

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;

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.

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;

services/src/main/resources/META-INF/services/org.keycloak.forms.login.LoginFormsProviderFactory

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

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

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.forms.login.freemarker.model.IdentityProviderBean.IdentityProvider;
-import org.keycloak.login.freemarker.model.IdentityProviderBean.IdentityProviderComparator;
+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)
  */

wildfly/extensions/pom.xml

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