libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Merge pull request #2231 from stianst/master

Browse source 
KEYCLOAK-2493
This commit is contained in:
Stian Thorgersen 2016-02-17 07:41:44 +00:00
commit 7f60e4f986
5 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/java/org/keycloak/common/Version.java
View file

@ -17,8 +17,6 @@
package org.keycloak.common; package org.keycloak.common;
import org.keycloak.common.util.Time;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Properties; import java.util.Properties;

1
distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json
View file

@ -37,7 +37,6 @@
}, },
"theme": { "theme": {
"default": "keycloak",
"staticMaxAge": 2592000, "staticMaxAge": 2592000,
"cacheTemplates": true, "cacheTemplates": true,
"cacheThemes": true, "cacheThemes": true,

3
services/src/main/java/org/keycloak/theme/ExtendingThemeManager.java
View file

@ -19,6 +19,7 @@ package org.keycloak.theme;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.keycloak.Config; import org.keycloak.Config;
import org.keycloak.common.Version;
import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSession;
import java.io.IOException; import java.io.IOException;
@ -42,7 +43,7 @@ public class ExtendingThemeManager implements ThemeProvider {
public ExtendingThemeManager(KeycloakSession session, ConcurrentHashMap<ExtendingThemeManagerFactory.ThemeKey, Theme> themeCache) { public ExtendingThemeManager(KeycloakSession session, ConcurrentHashMap<ExtendingThemeManagerFactory.ThemeKey, Theme> themeCache) {
this.session = session; this.session = session;
this.themeCache = themeCache; this.themeCache = themeCache;
this.defaultTheme = Config.scope("theme").get("default", "keycloak"); this.defaultTheme = Config.scope("theme").get("default", Version.NAME.toLowerCase());
} }
private List<ThemeProvider> getProviders() { private List<ThemeProvider> getProviders() {

1
testsuite/integration-arquillian/tests/base/src/test/resources/META-INF/keycloak-server.json
View file

@ -42,7 +42,6 @@
}, },
"theme": { "theme": {
"default": "keycloak",
"staticMaxAge": "${keycloak.theme.staticMaxAge:2592000}", "staticMaxAge": "${keycloak.theme.staticMaxAge:2592000}",
"cacheTemplates": "${keycloak.theme.cacheTemplates:true}", "cacheTemplates": "${keycloak.theme.cacheTemplates:true}",
"cacheThemes": "${keycloak.theme.cacheThemes:true}", "cacheThemes": "${keycloak.theme.cacheThemes:true}",

1
testsuite/integration/src/test/resources/META-INF/keycloak-server.json
View file

@ -37,7 +37,6 @@
}, },
"theme": { "theme": {
"default": "keycloak",
"staticMaxAge": "${keycloak.theme.staticMaxAge:2592000}", "staticMaxAge": "${keycloak.theme.staticMaxAge:2592000}",
"cacheTemplates": "${keycloak.theme.cacheTemplates:true}", "cacheTemplates": "${keycloak.theme.cacheTemplates:true}",
"cacheThemes": "${keycloak.theme.cacheThemes:true}", "cacheThemes": "${keycloak.theme.cacheThemes:true}",