From ad1c01057ae7ec669acd117977c1eea03ac99ce5 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Mon, 18 Aug 2014 15:19:30 -0700 Subject: [PATCH] Configure jclouds SLF4J module Also use jclouds-slf4j instead of slf4j-simple to avoid multiple bindings. --- pom.xml | 10 +++++----- src/test/java/org/gaul/s3proxy/S3ProxyTest.java | 8 +++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index fcf3938..71fb84f 100644 --- a/pom.xml +++ b/pom.xml @@ -177,6 +177,11 @@ jclouds-allblobstore ${jclouds.version} + + org.apache.jclouds.driver + jclouds-slf4j + ${jclouds.version} + org.apache.jclouds.labs glacier @@ -198,10 +203,5 @@ slf4j-api ${slf4j.version} - - org.slf4j - slf4j-simple - ${slf4j.version} - diff --git a/src/test/java/org/gaul/s3proxy/S3ProxyTest.java b/src/test/java/org/gaul/s3proxy/S3ProxyTest.java index 3b2fc57..bc2f64e 100644 --- a/src/test/java/org/gaul/s3proxy/S3ProxyTest.java +++ b/src/test/java/org/gaul/s3proxy/S3ProxyTest.java @@ -25,9 +25,11 @@ import java.util.Properties; import javax.servlet.http.HttpServletResponse; import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.io.ByteSource; import com.google.common.io.Resources; +import com.google.inject.Module; import org.jclouds.Constants; import org.jclouds.ContextBuilder; @@ -42,6 +44,7 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.io.Payload; import org.jclouds.io.payloads.ByteSourcePayload; +import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; import org.jclouds.rest.HttpClient; import org.junit.After; import org.junit.Before; @@ -85,9 +88,12 @@ public final class S3ProxyTest { String forceMultiPartUpload = s3ProxyProperties.getProperty( S3ProxyConstants.PROPERTY_FORCE_MULTI_PART_UPLOAD); + Properties properties = new Properties(); ContextBuilder builder = ContextBuilder .newBuilder(provider) - .credentials(identity, credential); + .credentials(identity, credential) + .modules(ImmutableList.of(new SLF4JLoggingModule())) + .overrides(properties); if (!Strings.isNullOrEmpty(endpoint)) { builder.endpoint(endpoint); }