From 6918d1c448e955acb21914c4b5cd3fbc7fba2915 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Wed, 21 Mar 2012 13:04:34 -0700
Subject: [PATCH] Issue 767: change openstack-nova and downstream to logging
 module discovery

---
 labs/hpcloud-compute/pom.xml                                | 6 ------
 labs/openstack-nova/pom.xml                                 | 6 ------
 .../nova/v1_1/internal/BaseNovaClientLiveTest.java          | 3 +--
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/labs/hpcloud-compute/pom.xml b/labs/hpcloud-compute/pom.xml
index 8165a15e71..fa62e74897 100644
--- a/labs/hpcloud-compute/pom.xml
+++ b/labs/hpcloud-compute/pom.xml
@@ -63,12 +63,6 @@
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jclouds.driver</groupId>
-          <artifactId>jclouds-log4j</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jclouds.labs</groupId>
diff --git a/labs/openstack-nova/pom.xml b/labs/openstack-nova/pom.xml
index f1be627007..e36096eb74 100644
--- a/labs/openstack-nova/pom.xml
+++ b/labs/openstack-nova/pom.xml
@@ -78,12 +78,6 @@
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jclouds.driver</groupId>
-          <artifactId>jclouds-log4j</artifactId>
-        </exclusion>
-      </exclusions> 
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientLiveTest.java b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientLiveTest.java
index 18c7e793f3..8ecfd8dcdb 100644
--- a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientLiveTest.java
+++ b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientLiveTest.java
@@ -21,7 +21,6 @@ package org.jclouds.openstack.nova.v1_1.internal;
 import java.util.Properties;
 
 import org.jclouds.compute.BaseVersionedServiceLiveTest;
-import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
 import org.jclouds.openstack.nova.v1_1.NovaAsyncClient;
 import org.jclouds.openstack.nova.v1_1.NovaClient;
 import org.jclouds.rest.RestContext;
@@ -52,7 +51,7 @@ public class BaseNovaClientLiveTest extends BaseVersionedServiceLiveTest {
       setupCredentials();
       Properties overrides = setupProperties();
       context = new RestContextFactory().createContext(provider, identity, credential,
-            ImmutableSet.<Module> of(new SLF4JLoggingModule(), new SshjSshClientModule()), overrides);
+            ImmutableSet.<Module> of(getLoggingModule(), new SshjSshClientModule()), overrides);
    }
 
    @AfterGroups(groups = "live")