From b049e93401e07d77b0a88b8fed10ea2b9c2aafae Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Sat, 7 Jan 2012 16:19:36 -0800
Subject: [PATCH] switched to slf4j for virtualbox

---
 sandbox-apis/virtualbox/pom.xml               |  7 --
 .../BaseVirtualBoxClientLiveTest.java         |  4 +-
 .../virtualbox/src/test/resources/logback.xml | 73 ++++++++++++++++---
 3 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/sandbox-apis/virtualbox/pom.xml b/sandbox-apis/virtualbox/pom.xml
index 13a1cdd81b..f4b3a57516 100644
--- a/sandbox-apis/virtualbox/pom.xml
+++ b/sandbox-apis/virtualbox/pom.xml
@@ -68,7 +68,6 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>7.4.0.RC0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -103,12 +102,6 @@
       <version>0.9.29</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jclouds.driver</groupId>
-      <artifactId>jclouds-log4j</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   
   <profiles>
diff --git a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java
index 4f5a3b82b7..e9294dd50b 100644
--- a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java
+++ b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java
@@ -34,7 +34,7 @@ import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.OsFamily;
 import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.config.ValueOfConfigurationKeyOrNull;
-import org.jclouds.logging.log4j.config.Log4JLoggingModule;
+import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
 import org.jclouds.sshj.config.SshjSshClientModule;
 import org.jclouds.virtualbox.config.VirtualBoxConstants;
 import org.jclouds.virtualbox.domain.VmSpec;
@@ -102,7 +102,7 @@ public class BaseVirtualBoxClientLiveTest extends BaseVersionedServiceLiveTest {
                         URI.create("file://" + System.getProperty("user.home") + "/.ssh/id_rsa")).build()));
 
       context = new ComputeServiceContextFactory().createContext(provider, identity, credential, ImmutableSet
-               .<Module> of(new Log4JLoggingModule(), new SshjSshClientModule(), hostModule), overrides);
+               .<Module> of(new SLF4JLoggingModule(), new SshjSshClientModule(), hostModule), overrides);
       Function<String, String> configProperties = context.utils().injector().getInstance(
                ValueOfConfigurationKeyOrNull.class);
       imageId = configProperties.apply(ComputeServiceConstants.PROPERTY_IMAGE_ID);
diff --git a/sandbox-apis/virtualbox/src/test/resources/logback.xml b/sandbox-apis/virtualbox/src/test/resources/logback.xml
index d68d005772..e5418aaa1b 100644
--- a/sandbox-apis/virtualbox/src/test/resources/logback.xml
+++ b/sandbox-apis/virtualbox/src/test/resources/logback.xml
@@ -1,15 +1,64 @@
 <?xml version="1.0"?>
 <configuration scan="false">
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} - %msg%n</pattern>
-    </encoder>
-  </appender>
-  <!-- turn OFF all logging (children can override) -->
-  <root level="OFF">
-    <appender-ref ref="STDOUT"/>
-  </root>
-  <logger name="jclouds.compute" level="debug"/>
-  <logger name="jclouds.headers" level="debug"/>
-  <logger name="jclouds.ssh" level="debug"/>
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds.log</file>
+
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d %-5p [%c] (%t) %m%n</Pattern>
+        </layout>
+    </appender>
+
+    <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds-wire.log</file>
+
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d %-5p [%c] (%t) %m%n</Pattern>
+        </layout>
+    </appender>
+
+    <appender name="COMPUTEFILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds-compute.log</file>
+
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d %-5p [%c] (%t) %m%n</Pattern>
+        </layout>
+    </appender>
+    
+    <appender name="SSHFILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds-ssh.log</file>
+
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d %-5p [%c] (%t) %m%n</Pattern>
+        </layout>
+    </appender>
+
+    <root>
+        <level value="warn" />
+    </root>
+
+    <category name="org.jclouds">
+        <priority value="DEBUG" />
+        <appender-ref ref="FILE" />
+    </category>
+
+    <category name="jclouds.wire">
+        <priority value="DEBUG" />
+        <appender-ref ref="WIREFILE" />
+    </category>
+
+    <category name="jclouds.headers">
+        <priority value="DEBUG" />
+        <appender-ref ref="WIREFILE" />
+    </category>
+
+    <category name="jclouds.compute">
+        <priority value="DEBUG" />
+        <appender-ref ref="COMPUTEFILE" />
+    </category>
+    
+    <category name="jclouds.ssh">
+        <priority value="DEBUG" />
+        <appender-ref ref="SSHFILE" />
+    </category>
+
 </configuration>