keycloak-aplcache

Removed empty include templates from forms, and use templates

11/12/2013 1:26:26 PM

Changes

forms/src/main/resources/META-INF/resources/forms/access.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/account.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/error.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/login.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/login-config-totp.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/login-oauth-grant.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/login-reset-password.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/login-totp.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/login-update-password.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/login-update-profile.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/login-verify-email.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/password.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/register.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/social.ftl 1(+0 -1)

forms/src/main/resources/META-INF/resources/forms/totp.ftl 1(+0 -1)

Details

diff --git a/forms/src/main/java/org/keycloak/service/FormServiceImpl.java b/forms/src/main/java/org/keycloak/service/FormServiceImpl.java
index b7b914c..28ed554 100755
--- a/forms/src/main/java/org/keycloak/service/FormServiceImpl.java
+++ b/forms/src/main/java/org/keycloak/service/FormServiceImpl.java
@@ -104,7 +104,7 @@ public class FormServiceImpl implements FormService {
         Configuration cfg = new Configuration();
 
         try {
-            cfg.setClassForTemplateLoading(FormServiceImpl.class,"/META-INF/resources");
+            cfg.setClassForTemplateLoading(FormServiceImpl.class,"/META-INF/resources/forms/theme/default");
             Template template = cfg.getTemplate(temp);
 
             template.process(input, out);
diff --git a/services/src/main/java/org/keycloak/services/resources/flows/Pages.java b/services/src/main/java/org/keycloak/services/resources/flows/Pages.java
index 695ecbb..9ee5ad4 100644
--- a/services/src/main/java/org/keycloak/services/resources/flows/Pages.java
+++ b/services/src/main/java/org/keycloak/services/resources/flows/Pages.java
@@ -26,34 +26,34 @@ package org.keycloak.services.resources.flows;
  */
 public class Pages {
 
-    public final static String ACCESS = "/forms/access.ftl";
+    public final static String ACCESS = "access.ftl";
 
-    public final static String ACCOUNT = "/forms/account.ftl";
+    public final static String ACCOUNT = "account.ftl";
 
-    public final static String LOGIN = "/forms/login.ftl";
+    public final static String LOGIN = "login.ftl";
 
-    public final static String LOGIN_TOTP = "/forms/login-totp.ftl";
+    public final static String LOGIN_TOTP = "login-totp.ftl";
 
-    public final static String LOGIN_CONFIG_TOTP = "/forms/login-config-totp.ftl";
+    public final static String LOGIN_CONFIG_TOTP = "login-config-totp.ftl";
 
-    public final static String LOGIN_VERIFY_EMAIL = "/forms/login-verify-email.ftl";
+    public final static String LOGIN_VERIFY_EMAIL = "login-verify-email.ftl";
 
-    public final static String OAUTH_GRANT = "/forms/login-oauth-grant.ftl";
+    public final static String OAUTH_GRANT = "login-oauth-grant.ftl";
 
-    public final static String PASSWORD = "/forms/password.ftl";
+    public final static String PASSWORD = "password.ftl";
 
-    public final static String LOGIN_RESET_PASSWORD = "/forms/login-reset-password.ftl";
+    public final static String LOGIN_RESET_PASSWORD = "login-reset-password.ftl";
 
-    public final static String LOGIN_UPDATE_PASSWORD = "/forms/login-update-password.ftl";
+    public final static String LOGIN_UPDATE_PASSWORD = "login-update-password.ftl";
 
-    public final static String REGISTER = "/forms/register.ftl";
+    public final static String REGISTER = "register.ftl";
 
-    public final static String ERROR = "/forms/error.ftl";
+    public final static String ERROR = "error.ftl";
 
-    public final static String SOCIAL = "/forms/social.ftl";
+    public final static String SOCIAL = "social.ftl";
 
-    public final static String TOTP = "/forms/totp.ftl";
+    public final static String TOTP = "totp.ftl";
 
-    public final static String LOGIN_UPDATE_PROFILE = "/forms/login-update-profile.ftl";
+    public final static String LOGIN_UPDATE_PROFILE = "login-update-profile.ftl";
 
 }