KEYCLOAK-1588 Strange version of slf4j not available in maven central
This commit is contained in:
parent
af2e3de96d
commit
d78c83b236
10 changed files with 20 additions and 86 deletions
|
@ -19,11 +19,6 @@
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-util-embedded-ldap</artifactId>
|
<artifactId>keycloak-util-embedded-ldap</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-log4j12</artifactId>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
13
pom.xml
13
pom.xml
|
@ -47,7 +47,7 @@
|
||||||
<postgresql.version>9.3-1100-jdbc41</postgresql.version>
|
<postgresql.version>9.3-1100-jdbc41</postgresql.version>
|
||||||
<dom4j.version>1.6.1</dom4j.version>
|
<dom4j.version>1.6.1</dom4j.version>
|
||||||
<xml-apis.version>1.4.01</xml-apis.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.version>9.0.0.Final</wildfly.version>
|
||||||
<wildfly.core.version>1.0.0.Final</wildfly.core.version>
|
<wildfly.core.version>1.0.0.Final</wildfly.core.version>
|
||||||
<wildfly.build-tools.version>1.0.0.Alpha8</wildfly.build-tools.version>
|
<wildfly.build-tools.version>1.0.0.Alpha8</wildfly.build-tools.version>
|
||||||
|
@ -491,23 +491,12 @@
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<version>${slf4j.version}</version>
|
<version>${slf4j.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-simple</artifactId>
|
|
||||||
<version>${slf4j.version}</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-log4j12</artifactId>
|
<artifactId>slf4j-log4j12</artifactId>
|
||||||
<version>${slf4j.version}</version>
|
<version>${slf4j.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>jcl-over-slf4j</artifactId>
|
|
||||||
<version>${slf4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- Needed for picketlink perf test -->
|
<!-- Needed for picketlink perf test -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>mysql</groupId>
|
<groupId>mysql</groupId>
|
||||||
|
|
|
@ -35,14 +35,6 @@
|
||||||
<groupId>log4j</groupId>
|
<groupId>log4j</groupId>
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-api</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-log4j12</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jboss.spec.javax.servlet</groupId>
|
<groupId>org.jboss.spec.javax.servlet</groupId>
|
||||||
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
||||||
|
|
|
@ -35,15 +35,6 @@
|
||||||
<groupId>log4j</groupId>
|
<groupId>log4j</groupId>
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>org.jboss.spec.javax.servlet</groupId>
|
<groupId>org.jboss.spec.javax.servlet</groupId>
|
||||||
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
||||||
|
|
|
@ -17,6 +17,10 @@
|
||||||
<description />
|
<description />
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jboss.logging</groupId>
|
||||||
|
<artifactId>jboss-logging</artifactId>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-dependencies-server-all</artifactId>
|
<artifactId>keycloak-dependencies-server-all</artifactId>
|
||||||
|
@ -30,14 +34,6 @@
|
||||||
<groupId>log4j</groupId>
|
<groupId>log4j</groupId>
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-api</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-log4j12</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jboss.spec.javax.servlet</groupId>
|
<groupId>org.jboss.spec.javax.servlet</groupId>
|
||||||
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
||||||
|
|
|
@ -6,16 +6,15 @@ import org.apache.catalina.LifecycleException;
|
||||||
import org.apache.catalina.connector.Connector;
|
import org.apache.catalina.connector.Connector;
|
||||||
import org.apache.catalina.core.StandardContext;
|
import org.apache.catalina.core.StandardContext;
|
||||||
import org.apache.catalina.startup.Embedded;
|
import org.apache.catalina.startup.Embedded;
|
||||||
|
import org.jboss.logging.Logger;
|
||||||
import org.keycloak.adapters.tomcat.KeycloakAuthenticatorValve;
|
import org.keycloak.adapters.tomcat.KeycloakAuthenticatorValve;
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
public class TomcatServer {
|
public class TomcatServer {
|
||||||
private Embedded server;
|
private Embedded server;
|
||||||
private int port;
|
private int port;
|
||||||
private boolean isRunning;
|
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 static final boolean isInfo = LOG.isInfoEnabled();
|
||||||
private final Host host;
|
private final Host host;
|
||||||
|
|
||||||
|
@ -71,7 +70,7 @@ public class TomcatServer {
|
||||||
*/
|
*/
|
||||||
public void start() throws LifecycleException {
|
public void start() throws LifecycleException {
|
||||||
if (isRunning) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -85,7 +84,7 @@ public class TomcatServer {
|
||||||
Connector connector = server.createConnector(host.getName(), port, false);
|
Connector connector = server.createConnector(host.getName(), port, false);
|
||||||
server.addConnector(connector);
|
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.setAwait(true);
|
||||||
server.start();
|
server.start();
|
||||||
|
@ -97,7 +96,7 @@ public class TomcatServer {
|
||||||
*/
|
*/
|
||||||
public void stop() throws LifecycleException {
|
public void stop() throws LifecycleException {
|
||||||
if (!isRunning) {
|
if (!isRunning) {
|
||||||
LOG.warn("Tomcat server is not running @ port={}", port);
|
LOG.warnv("Tomcat server is not running @ port={}", port);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,15 +46,6 @@
|
||||||
<groupId>log4j</groupId>
|
<groupId>log4j</groupId>
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>org.jboss.spec.javax.servlet</groupId>
|
<groupId>org.jboss.spec.javax.servlet</groupId>
|
||||||
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
||||||
|
|
|
@ -30,15 +30,6 @@
|
||||||
<groupId>log4j</groupId>
|
<groupId>log4j</groupId>
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>org.jboss.spec.javax.servlet</groupId>
|
<groupId>org.jboss.spec.javax.servlet</groupId>
|
||||||
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
||||||
|
|
|
@ -28,13 +28,8 @@
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.jboss.logging</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>jboss-logging</artifactId>
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-log4j12</artifactId>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -1,16 +1,10 @@
|
||||||
package org.keycloak.util.ldap;
|
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.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.LdapComparator;
|
||||||
import org.apache.directory.api.ldap.model.schema.SchemaManager;
|
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.ComparatorRegistry;
|
||||||
import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader;
|
import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader;
|
||||||
import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor;
|
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.CacheService;
|
||||||
import org.apache.directory.server.core.api.DirectoryService;
|
import org.apache.directory.server.core.api.DirectoryService;
|
||||||
import org.apache.directory.server.core.api.InstanceLayout;
|
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.partition.Partition;
|
||||||
import org.apache.directory.server.core.api.schema.SchemaPartition;
|
import org.apache.directory.server.core.api.schema.SchemaPartition;
|
||||||
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
|
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
|
||||||
import org.apache.directory.server.core.factory.DirectoryServiceFactory;
|
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.LdifPartitionFactory;
|
||||||
import org.apache.directory.server.core.factory.PartitionFactory;
|
import org.apache.directory.server.core.factory.PartitionFactory;
|
||||||
import org.apache.directory.server.core.partition.ldif.LdifPartition;
|
import org.apache.directory.server.core.partition.ldif.LdifPartition;
|
||||||
import org.apache.directory.server.i18n.I18n;
|
import org.apache.directory.server.i18n.I18n;
|
||||||
import org.slf4j.Logger;
|
import org.jboss.logging.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
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
|
* 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 {
|
class FileDirectoryServiceFactory implements DirectoryServiceFactory {
|
||||||
|
|
||||||
/** A logger for this class */
|
/** 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. */
|
/** The directory service. */
|
||||||
private DirectoryService directoryService;
|
private DirectoryService directoryService;
|
||||||
|
|
Loading…
Reference in a new issue