keycloak-aplcache

diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java
index 9edaa46..30b15fa 100644
--- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java
+++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java
@@ -7,7 +7,7 @@ import org.keycloak.freemarker.FreeMarkerUtil;
 import org.keycloak.freemarker.Theme;
 import org.keycloak.freemarker.ThemeLoader;
 import org.keycloak.login.LoginForms;
-import org.keycloak.login.FormsPages;
+import org.keycloak.login.LoginFormsPages;
 import org.keycloak.login.freemarker.model.LoginBean;
 import org.keycloak.login.freemarker.model.MessageBean;
 import org.keycloak.login.freemarker.model.OAuthGrantBean;
@@ -75,20 +75,20 @@ public class FreeMarkerLoginForms implements LoginForms {
 
     public Response createResponse(UserModel.RequiredAction action) {
         String actionMessage;
-        FormsPages page;
+        LoginFormsPages page;
 
         switch (action) {
             case CONFIGURE_TOTP:
                 actionMessage = Messages.ACTION_WARN_TOTP;
-                page = FormsPages.LOGIN_CONFIG_TOTP;
+                page = LoginFormsPages.LOGIN_CONFIG_TOTP;
                 break;
             case UPDATE_PROFILE:
                 actionMessage = Messages.ACTION_WARN_PROFILE;
-                page = FormsPages.LOGIN_UPDATE_PROFILE;
+                page = LoginFormsPages.LOGIN_UPDATE_PROFILE;
                 break;
             case UPDATE_PASSWORD:
                 actionMessage = Messages.ACTION_WARN_PASSWD;
-                page = FormsPages.LOGIN_UPDATE_PASSWORD;
+                page = LoginFormsPages.LOGIN_UPDATE_PASSWORD;
                 break;
             case VERIFY_EMAIL:
                 try {
@@ -98,7 +98,7 @@ public class FreeMarkerLoginForms implements LoginForms {
                 }
 
                 actionMessage = Messages.ACTION_WARN_EMAIL;
-                page = FormsPages.LOGIN_VERIFY_EMAIL;
+                page = LoginFormsPages.LOGIN_VERIFY_EMAIL;
                 break;
             default:
                 return Response.serverError().build();
@@ -111,7 +111,7 @@ public class FreeMarkerLoginForms implements LoginForms {
         return createResponse(page);
     }
 
-    private Response createResponse(FormsPages page) {
+    private Response createResponse(LoginFormsPages page) {
         MultivaluedMap<String, String> queryParameterMap = uriInfo.getQueryParameters();
 
         String requestURI = uriInfo.getBaseUri().getPath();
@@ -189,32 +189,32 @@ public class FreeMarkerLoginForms implements LoginForms {
     }
 
     public Response createLogin() {
-        return createResponse(FormsPages.LOGIN);
+        return createResponse(LoginFormsPages.LOGIN);
     }
 
     public Response createPasswordReset() {
-        return createResponse(FormsPages.LOGIN_RESET_PASSWORD);
+        return createResponse(LoginFormsPages.LOGIN_RESET_PASSWORD);
     }
 
     public Response createUsernameReminder() {
-        return createResponse(FormsPages.LOGIN_USERNAME_REMINDER);
+        return createResponse(LoginFormsPages.LOGIN_USERNAME_REMINDER);
     }
 
     public Response createLoginTotp() {
-        return createResponse(FormsPages.LOGIN_TOTP);
+        return createResponse(LoginFormsPages.LOGIN_TOTP);
     }
 
     public Response createRegistration() {
-        return createResponse(FormsPages.REGISTER);
+        return createResponse(LoginFormsPages.REGISTER);
     }
 
     public Response createErrorPage() {
         setStatus(Response.Status.INTERNAL_SERVER_ERROR);
-        return createResponse(FormsPages.ERROR);
+        return createResponse(LoginFormsPages.ERROR);
     }
 
     public Response createOAuthGrant() {
-        return createResponse(FormsPages.OAUTH_GRANT);
+        return createResponse(LoginFormsPages.OAUTH_GRANT);
     }
 
     public FreeMarkerLoginForms setError(String message) {

diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java
index 4d7ddd8..b15cada 100644
--- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java
+++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java
@@ -2,7 +2,7 @@ package org.keycloak.login.freemarker;
 
 import org.jboss.resteasy.spi.HttpRequest;
 import org.keycloak.login.LoginForms;
-import org.keycloak.login.FormsProvider;
+import org.keycloak.login.LoginFormsProvider;
 import org.keycloak.models.RealmModel;
 
 import javax.ws.rs.core.UriInfo;
@@ -10,7 +10,7 @@ import javax.ws.rs.core.UriInfo;
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
  */
-public class FreeMarkerLoginFormsProvider implements FormsProvider {
+public class FreeMarkerLoginFormsProvider implements LoginFormsProvider {
 
     @Override
     public LoginForms createForms(RealmModel realm, HttpRequest request, UriInfo uriInfo) {

diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java
index 69a5e4b..ad96e38 100644
--- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java
+++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java
@@ -1,13 +1,13 @@
 package org.keycloak.login.freemarker;
 
-import org.keycloak.login.FormsPages;
+import org.keycloak.login.LoginFormsPages;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
  */
 public class Templates {
 
-    public static String getTemplate(FormsPages page) {
+    public static String getTemplate(LoginFormsPages page) {
         switch (page) {
             case LOGIN:
                 return "login.ftl";

diff --git a/services/src/main/java/org/keycloak/services/resources/flows/Flows.java b/services/src/main/java/org/keycloak/services/resources/flows/Flows.java
index dd2e26a..5df9493 100755
--- a/services/src/main/java/org/keycloak/services/resources/flows/Flows.java
+++ b/services/src/main/java/org/keycloak/services/resources/flows/Flows.java
@@ -23,7 +23,7 @@ package org.keycloak.services.resources.flows;
 
 import org.jboss.resteasy.spi.HttpRequest;
 import org.keycloak.login.LoginForms;
-import org.keycloak.login.FormsLoader;
+import org.keycloak.login.LoginFormsLoader;
 import org.keycloak.models.RealmModel;
 import org.keycloak.services.managers.AuthenticationManager;
 import org.keycloak.services.managers.TokenManager;
@@ -39,7 +39,7 @@ public class Flows {
     }
 
     public static LoginForms forms(RealmModel realm, HttpRequest request, UriInfo uriInfo) {
-        return FormsLoader.load().createForms(realm, request, uriInfo);
+        return LoginFormsLoader.load().createForms(realm, request, uriInfo);
     }
 
     public static OAuthFlows oauth(RealmModel realm, HttpRequest request, UriInfo uriInfo, AuthenticationManager authManager,