From 5496f043a5490537faa8c003531f7a78dee2738b Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Tue, 20 May 2014 14:42:07 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20config=20for=20folder=20theme=20provider?=
 =?UTF-8?q?=C2=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth-server/src/main/webapp/WEB-INF/keycloak-server.json  | 4 +++-
 .../src/main/resources/META-INF/keycloak-server.json          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json
index 62405d9d43..73fc4b0740 100644
--- a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json
+++ b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json
@@ -17,7 +17,9 @@
 
     "theme": {
         "default": "keycloak",
-        "dir": "${jboss.server.config.dir}/themes"
+        "folder": {
+            "dir": "${jboss.server.config.dir}/themes"
+        }
     },
 
     "scheduled": {
diff --git a/testsuite/integration/src/main/resources/META-INF/keycloak-server.json b/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
index 6b4cd35adb..f0fd04673e 100644
--- a/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
+++ b/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
@@ -17,7 +17,9 @@
 
     "theme": {
         "default": "keycloak",
-        "dir": "${keycloak.theme.dir}"
+        "folder": {
+            "dir": "${keycloak.theme.dir}"
+        }
     },
 
     "login-forms": {