Merge pull request #406 from stianst/master

Fix config for folder theme provider£
2014-05-20 14:42:39 +01:00 · 2014-05-20 14:42:39 +01:00 · 357337047b
commit 357337047b
parent a22aa8055f 5496f043a5
2 changed files with 6 additions and 2 deletions
--- 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": {
--- 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": {