keycloak-uncached

Merge remote-tracking branch 'upstream/master'

5/20/2014 12:38:50 PM

Bill Burke

Commit: b7cf1bb

Tree: 2cdb61a

Parents: b3dd349
3573370

Changes

project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json 4(+3 -1)

testsuite/integration/src/main/resources/META-INF/keycloak-server.json 4(+3 -1)

Details

project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json 4(+3 -1)

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 62405d9..73fc4b0 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": {

testsuite/integration/src/main/resources/META-INF/keycloak-server.json 4(+3 -1)

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 6b4cd35..f0fd046 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": {