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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Bill Burke 2015-06-17 09:43:14 -04:00
commit 1aa338fe3e
6 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
distribution/demo-dist/pom.xml
View file

@ -16,7 +16,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-server-overlay</artifactId> <artifactId>keycloak-server-overlay</artifactId>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
<dependency> <dependency>
@ -77,7 +77,7 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-server-overlay</artifactId> <artifactId>keycloak-server-overlay</artifactId>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/unpacked/keycloak-server-overlay-${project.version}</outputDirectory> <outputDirectory>${project.build.directory}/unpacked/keycloak-server-overlay-${project.version}</outputDirectory>
</artifactItem> </artifactItem>

4
forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties
View file

@ -14,7 +14,7 @@ kcFeedBackClass=col-xs-12 col-sm-4 col-md-5 col-lg-6
kcFeedBackPlaceholderClass=col-xs-12 col-sm-4 col-md-5 col-lg-6 kcFeedBackPlaceholderClass=col-xs-12 col-sm-4 col-md-5 col-lg-6
kcLocaleClass=col-xs-12 col-sm-1 kcLocaleClass=col-xs-12 col-sm-1
kcFormAreaClass=col-xs-12 col-sm-8 col-md-8 col-lg-6 login kcFormAreaClass=col-xs-12 col-sm-8 col-md-8 col-lg-7 login
kcFormClass=form-horizontal kcFormClass=form-horizontal
kcFormGroupClass=form-group kcFormGroupClass=form-group
@ -27,7 +27,7 @@ kcFormOptionsClass=col-xs-4 col-sm-5 col-md-offset-4 col-md-4 col-lg-offset-3 co
kcFormButtonsClass=col-xs-8 col-sm-7 col-md-4 col-lg-4 submit kcFormButtonsClass=col-xs-8 col-sm-7 col-md-4 col-lg-4 submit
kcTextareaClass=form-control kcTextareaClass=form-control
kcInfoAreaClass=col-xs-12 col-sm-4 col-md-4 col-lg-6 details kcInfoAreaClass=col-xs-12 col-sm-4 col-md-4 col-lg-5 details
##### css classes for form buttons ##### css classes for form buttons
# main class used for all buttons # main class used for all buttons

2
model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanRealmCache.java vendored
View file

@ -110,7 +110,7 @@ public class InfinispanRealmCache implements RealmCache {
@Override @Override
public void invalidateRole(CachedRole role) { public void invalidateRole(CachedRole role) {
logger.tracev("Removing role {0}", role.getId()); logger.tracev("Removing role {0}", role.getId());
cache.remove(role); cache.remove(role.getId());
} }
@Override @Override

2
pom.xml
View file

@ -1107,7 +1107,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-server-overlay</artifactId> <artifactId>keycloak-server-overlay</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
</dependency> </dependency>

2
testsuite/integration/pom.xml
View file

@ -382,7 +382,7 @@
<keycloak.eventsStore.provider>jpa</keycloak.eventsStore.provider> <keycloak.eventsStore.provider>jpa</keycloak.eventsStore.provider>
<keycloak.userSessions.provider>jpa</keycloak.userSessions.provider> <keycloak.userSessions.provider>jpa</keycloak.userSessions.provider>
<keycloak.liquibase.logging.level>trace</keycloak.liquibase.logging.level> <keycloak.liquibase.logging.level>debug</keycloak.liquibase.logging.level>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>

8
testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPEmbeddedServer.java
View file

@ -2,6 +2,7 @@ package org.keycloak.testsuite.ldap;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -148,7 +149,12 @@ public class LDAPEmbeddedServer {
} }
// For now, assume that LDIF file is on classpath // For now, assume that LDIF file is on classpath
InputStream is = getClass().getClassLoader().getResourceAsStream(ldifFile); InputStream is;
if (ldifFile.startsWith("file:")) {
is = new URL(ldifFile).openStream();
} else {
is = getClass().getClassLoader().getResourceAsStream(ldifFile);
}
if (is == null) { if (is == null) {
throw new IllegalStateException("LDIF file not found on classpath. Location was: " + ldifFile); throw new IllegalStateException("LDIF file not found on classpath. Location was: " + ldifFile);
} }