From 0373e508ec333dfff16da9e3a1331db560681b0b Mon Sep 17 00:00:00 2001
From: "adrian.f.cole" <adrian.f.cole@3d8758e0-26b5-11de-8745-db77d3ebf521>
Date: Mon, 11 Jan 2010 18:01:04 +0000
Subject: [PATCH] removed httpnio from Enterprise config and fixed null logger

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2639 3d8758e0-26b5-11de-8745-db77d3ebf521
---
 .../logging/config/NullLoggingModule.java     | 23 +++++++++++++------
 extensions/enterprise/pom.xml                 |  2 ++
 .../config/EnterpriseConfigurationModule.java |  4 ----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/jclouds/logging/config/NullLoggingModule.java b/core/src/main/java/org/jclouds/logging/config/NullLoggingModule.java
index 616f606f12..f9ab9c04f5 100644
--- a/core/src/main/java/org/jclouds/logging/config/NullLoggingModule.java
+++ b/core/src/main/java/org/jclouds/logging/config/NullLoggingModule.java
@@ -28,11 +28,20 @@ import org.jclouds.logging.NullLogger;
  * 
  */
 public class NullLoggingModule extends LoggingModule {
-    public Logger.LoggerFactory createLoggerFactory() {
-	return new Logger.LoggerFactory() {
-	    public Logger getLogger(String category) {
-		return Logger.NULL;
-	    }
-	};
-    }
+
+   public Logger.LoggerFactory createLoggerFactory() {
+      return new Logger.LoggerFactory() {
+         public Logger getLogger(String category) {
+            return Logger.NULL;
+         }
+      };
+   }
+
+   /**
+    * note that we override, as if we are not logging, there's no use in the overhead of listening
+    * for loggers
+    */
+   @Override
+   protected void configure() {
+   }
 }
diff --git a/extensions/enterprise/pom.xml b/extensions/enterprise/pom.xml
index bfb5b85a63..78ce4ca8d8 100644
--- a/extensions/enterprise/pom.xml
+++ b/extensions/enterprise/pom.xml
@@ -42,11 +42,13 @@
             <artifactId>jclouds-bouncycastle</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!--  not reliable enough yet
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jclouds-httpnio</artifactId>
             <version>${project.version}</version>
         </dependency>
+         -->
     </dependencies>
     
 </project>
diff --git a/extensions/enterprise/src/main/java/org/jclouds/enterprise/config/EnterpriseConfigurationModule.java b/extensions/enterprise/src/main/java/org/jclouds/enterprise/config/EnterpriseConfigurationModule.java
index 245ef0eccc..bb08f561ef 100755
--- a/extensions/enterprise/src/main/java/org/jclouds/enterprise/config/EnterpriseConfigurationModule.java
+++ b/extensions/enterprise/src/main/java/org/jclouds/enterprise/config/EnterpriseConfigurationModule.java
@@ -25,8 +25,6 @@ import org.jclouds.concurrent.config.ConfiguresExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
 import org.jclouds.date.joda.config.JodaDateServiceModule;
 import org.jclouds.encryption.bouncycastle.config.BouncyCastleEncryptionServiceModule;
-import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
-import org.jclouds.http.httpnio.config.NioTransformingHttpCommandExecutorServiceModule;
 
 /**
  * Configures Enterprise-grade components
@@ -34,7 +32,6 @@ import org.jclouds.http.httpnio.config.NioTransformingHttpCommandExecutorService
  * @author Adrian Cole
  * 
  */
-@ConfiguresHttpCommandExecutorService
 @ConfiguresExecutorService
 public class EnterpriseConfigurationModule extends ExecutorServiceModule {
 
@@ -51,7 +48,6 @@ public class EnterpriseConfigurationModule extends ExecutorServiceModule {
       super.configure();
       install(new BouncyCastleEncryptionServiceModule());
       install(new JodaDateServiceModule());
-      install(new NioTransformingHttpCommandExecutorServiceModule());
    }
 
 }