keycloak-uncached
Changes
examples/ldap/embedded-ldap/pom.xml 5(+0 -5)
pom.xml 13(+1 -12)
testsuite/integration/pom.xml 8(+0 -8)
testsuite/proxy/pom.xml 9(+0 -9)
testsuite/tomcat6/pom.xml 12(+4 -8)
testsuite/tomcat7/pom.xml 9(+0 -9)
testsuite/tomcat8/pom.xml 9(+0 -9)
util/embedded-ldap/pom.xml 9(+2 -7)
Details
examples/ldap/embedded-ldap/pom.xml 5(+0 -5)
diff --git a/examples/ldap/embedded-ldap/pom.xml b/examples/ldap/embedded-ldap/pom.xml
index b981072..44f68e1 100644
--- a/examples/ldap/embedded-ldap/pom.xml
+++ b/examples/ldap/embedded-ldap/pom.xml
@@ -19,11 +19,6 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-util-embedded-ldap</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
pom.xml 13(+1 -12)
diff --git a/pom.xml b/pom.xml
index 87a1a96..0f74602 100755
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<postgresql.version>9.3-1100-jdbc41</postgresql.version>
<dom4j.version>1.6.1</dom4j.version>
<xml-apis.version>1.4.01</xml-apis.version>
- <slf4j.version>1.7.7.jbossorg-1</slf4j.version>
+ <slf4j.version>1.7.7</slf4j.version>
<wildfly.version>9.0.0.Final</wildfly.version>
<wildfly.core.version>1.0.0.Final</wildfly.core.version>
<wildfly.build-tools.version>1.0.0.Alpha8</wildfly.build-tools.version>
@@ -493,21 +493,10 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<!-- Needed for picketlink perf test -->
<dependency>
<groupId>mysql</groupId>
testsuite/integration/pom.xml 8(+0 -8)
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index 7d02e50..ae85538 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -36,14 +36,6 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
testsuite/proxy/pom.xml 9(+0 -9)
diff --git a/testsuite/proxy/pom.xml b/testsuite/proxy/pom.xml
index e39de07..69e8e92 100755
--- a/testsuite/proxy/pom.xml
+++ b/testsuite/proxy/pom.xml
@@ -36,15 +36,6 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
testsuite/tomcat6/pom.xml 12(+4 -8)
diff --git a/testsuite/tomcat6/pom.xml b/testsuite/tomcat6/pom.xml
index fe817e8..3fd85d4 100755
--- a/testsuite/tomcat6/pom.xml
+++ b/testsuite/tomcat6/pom.xml
@@ -17,6 +17,10 @@
<description />
<dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-dependencies-server-all</artifactId>
@@ -31,14 +35,6 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
diff --git a/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatServer.java b/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatServer.java
index 7b41a05..a0ebb08 100755
--- a/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatServer.java
+++ b/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatServer.java
@@ -6,16 +6,15 @@ import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Embedded;
+import org.jboss.logging.Logger;
import org.keycloak.adapters.tomcat.KeycloakAuthenticatorValve;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TomcatServer {
private Embedded server;
private int port;
private boolean isRunning;
- private static final Logger LOG = LoggerFactory.getLogger(TomcatServer.class);
+ private static final Logger LOG = Logger.getLogger(TomcatServer.class);
private static final boolean isInfo = LOG.isInfoEnabled();
private final Host host;
@@ -71,7 +70,7 @@ public class TomcatServer {
*/
public void start() throws LifecycleException {
if (isRunning) {
- LOG.warn("Tomcat server is already running @ port={}; ignoring the start", port);
+ LOG.warnv("Tomcat server is already running @ port={}; ignoring the start", port);
return;
}
@@ -85,7 +84,7 @@ public class TomcatServer {
Connector connector = server.createConnector(host.getName(), port, false);
server.addConnector(connector);
- if (isInfo) LOG.info("Starting the Tomcat server @ port={}", port);
+ if (isInfo) LOG.infov("Starting the Tomcat server @ port={}", port);
server.setAwait(true);
server.start();
@@ -97,7 +96,7 @@ public class TomcatServer {
*/
public void stop() throws LifecycleException {
if (!isRunning) {
- LOG.warn("Tomcat server is not running @ port={}", port);
+ LOG.warnv("Tomcat server is not running @ port={}", port);
return;
}
testsuite/tomcat7/pom.xml 9(+0 -9)
diff --git a/testsuite/tomcat7/pom.xml b/testsuite/tomcat7/pom.xml
index c3bc09e..5255f93 100755
--- a/testsuite/tomcat7/pom.xml
+++ b/testsuite/tomcat7/pom.xml
@@ -47,15 +47,6 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
testsuite/tomcat8/pom.xml 9(+0 -9)
diff --git a/testsuite/tomcat8/pom.xml b/testsuite/tomcat8/pom.xml
index a7cddbd..1a7ac3c 100755
--- a/testsuite/tomcat8/pom.xml
+++ b/testsuite/tomcat8/pom.xml
@@ -31,15 +31,6 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
util/embedded-ldap/pom.xml 9(+2 -7)
diff --git a/util/embedded-ldap/pom.xml b/util/embedded-ldap/pom.xml
index 5a1e927..6eeeece 100644
--- a/util/embedded-ldap/pom.xml
+++ b/util/embedded-ldap/pom.xml
@@ -28,13 +28,8 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>compile</scope>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
diff --git a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/FileDirectoryServiceFactory.java b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/FileDirectoryServiceFactory.java
index f0153ec..4adb137 100644
--- a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/FileDirectoryServiceFactory.java
+++ b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/FileDirectoryServiceFactory.java
@@ -1,16 +1,10 @@
package org.keycloak.util.ldap;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.commons.io.FileUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
-import org.apache.directory.api.ldap.model.exception.LdapEntryAlreadyExistsException;
-import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.schema.LdapComparator;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
-import org.apache.directory.api.ldap.model.schema.comparators.NormalizingComparator;
+import org.
+ apache.directory.api.ldap.model.schema.comparators.NormalizingComparator;
import org.apache.directory.api.ldap.model.schema.registries.ComparatorRegistry;
import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader;
import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor;
@@ -23,18 +17,19 @@ import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.api.CacheService;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.InstanceLayout;
-import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.partition.Partition;
import org.apache.directory.server.core.api.schema.SchemaPartition;
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
import org.apache.directory.server.core.factory.DirectoryServiceFactory;
-import org.apache.directory.server.core.factory.JdbmPartitionFactory;
import org.apache.directory.server.core.factory.LdifPartitionFactory;
import org.apache.directory.server.core.factory.PartitionFactory;
import org.apache.directory.server.core.partition.ldif.LdifPartition;
import org.apache.directory.server.i18n.I18n;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jboss.logging.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
/**
* Slightly modified version of {@link DefaultDirectoryServiceFactory} which allows persistence among restarts and uses LDIF partitions by default
@@ -44,7 +39,7 @@ import org.slf4j.LoggerFactory;
class FileDirectoryServiceFactory implements DirectoryServiceFactory {
/** A logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger(FileDirectoryServiceFactory.class);
+ private static final Logger LOG = Logger.getLogger(FileDirectoryServiceFactory.class);
/** The directory service. */
private DirectoryService directoryService;