Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed httpnio from Enterprise config and fixed null logger 

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2639 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
adrian.f.cole 2010-01-11 18:01:04 +00:00
parent 7467011318
commit 0373e508ec
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/org/jclouds/logging/config/NullLoggingModule.java
View File

@ -28,6 +28,7 @@ import org.jclouds.logging.NullLogger;
* *
*/ */
public class NullLoggingModule extends LoggingModule { public class NullLoggingModule extends LoggingModule {
public Logger.LoggerFactory createLoggerFactory() { public Logger.LoggerFactory createLoggerFactory() {
return new Logger.LoggerFactory() { return new Logger.LoggerFactory() {
public Logger getLogger(String category) { public Logger getLogger(String category) {
@ -35,4 +36,12 @@ public class NullLoggingModule extends LoggingModule {
} }
}; };
} }
/**
* 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() {
}
} }

2
extensions/enterprise/pom.xml
View File

@ -42,11 +42,13 @@
<artifactId>jclouds-bouncycastle</artifactId> <artifactId>jclouds-bouncycastle</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- not reliable enough yet
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jclouds-httpnio</artifactId> <artifactId>jclouds-httpnio</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
-->
</dependencies> </dependencies>
</project> </project>

4
extensions/enterprise/src/main/java/org/jclouds/enterprise/config/EnterpriseConfigurationModule.java
View File

@ -25,8 +25,6 @@ import org.jclouds.concurrent.config.ConfiguresExecutorService;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.date.joda.config.JodaDateServiceModule; import org.jclouds.date.joda.config.JodaDateServiceModule;
import org.jclouds.encryption.bouncycastle.config.BouncyCastleEncryptionServiceModule; import org.jclouds.encryption.bouncycastle.config.BouncyCastleEncryptionServiceModule;
import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
import org.jclouds.http.httpnio.config.NioTransformingHttpCommandExecutorServiceModule;
/** /**
* Configures Enterprise-grade components * Configures Enterprise-grade components
@ -34,7 +32,6 @@ import org.jclouds.http.httpnio.config.NioTransformingHttpCommandExecutorService
* @author Adrian Cole * @author Adrian Cole
* *
*/ */
@ConfiguresHttpCommandExecutorService
@ConfiguresExecutorService @ConfiguresExecutorService
public class EnterpriseConfigurationModule extends ExecutorServiceModule { public class EnterpriseConfigurationModule extends ExecutorServiceModule {
@ -51,7 +48,6 @@ public class EnterpriseConfigurationModule extends ExecutorServiceModule {
super.configure(); super.configure();
install(new BouncyCastleEncryptionServiceModule()); install(new BouncyCastleEncryptionServiceModule());
install(new JodaDateServiceModule()); install(new JodaDateServiceModule());
install(new NioTransformingHttpCommandExecutorServiceModule());
} }
} }