From 3d2784e4d2db0bf7e6026689b3a73d16060cd0cd Mon Sep 17 00:00:00 2001
From: "adrian.f.cole" <adrian.f.cole@3d8758e0-26b5-11de-8745-db77d3ebf521>
Date: Tue, 15 Dec 2009 05:56:38 +0000
Subject: [PATCH] Issue 128: temporarily adding log4j until we have a
 commons-logging adapter in jclouds

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2433 3d8758e0-26b5-11de-8745-db77d3ebf521
---
 tools/vfs/pom.xml                                 | 15 ++++++++-------
 .../provider/blobstore/BlobStoreFileProvider.java |  3 ++-
 .../blobstore/test/BlobStoreProviderTestCase.java |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tools/vfs/pom.xml b/tools/vfs/pom.xml
index cd28c08926..2dd27b97a7 100644
--- a/tools/vfs/pom.xml
+++ b/tools/vfs/pom.xml
@@ -20,19 +20,20 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-vfs</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-httpclient</groupId>
-                    <artifactId>commons-httpclient</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        <!-- should be transitive from above, but isn't -->
+
+        <!-- should be transitive from above, but aren't -->
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.1</version>
         </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-vfs</artifactId>
diff --git a/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileProvider.java b/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileProvider.java
index 46b705e355..10b32d29f1 100644
--- a/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileProvider.java
+++ b/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileProvider.java
@@ -44,6 +44,7 @@ import org.jclouds.blobstore.BlobStore;
 import org.jclouds.blobstore.BlobStoreContextFactory;
 import org.jclouds.domain.Credentials;
 import org.jclouds.http.HttpUtils;
+import org.jclouds.logging.log4j.config.Log4JLoggingModule;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -67,7 +68,7 @@ public class BlobStoreFileProvider extends AbstractOriginatingFileProvider {
    private final Iterable<Module> modules;
 
    public BlobStoreFileProvider() {
-      this(ImmutableList.<Module> of());
+      this(ImmutableList.<Module> of(new Log4JLoggingModule()));
    }
 
    public BlobStoreFileProvider(Iterable<Module> modules) {
diff --git a/tools/vfs/src/test/java/org/jclouds/vfs/provider/blobstore/test/BlobStoreProviderTestCase.java b/tools/vfs/src/test/java/org/jclouds/vfs/provider/blobstore/test/BlobStoreProviderTestCase.java
index 8248765818..a178bcbd1c 100644
--- a/tools/vfs/src/test/java/org/jclouds/vfs/provider/blobstore/test/BlobStoreProviderTestCase.java
+++ b/tools/vfs/src/test/java/org/jclouds/vfs/provider/blobstore/test/BlobStoreProviderTestCase.java
@@ -58,7 +58,7 @@ public class BlobStoreProviderTestCase extends AbstractProviderTestConfig {
     */
    public void prepare(final DefaultFileSystemManager manager) throws Exception {
       manager.addProvider("blobstore", new BlobStoreFileProvider(ImmutableList
-               .<Module>of(new Log4JLoggingModule())));
+               .<Module> of(new Log4JLoggingModule())));
    }
 
    /**