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

changed apache hc to not be automatically included in the enterprise distribution, as untuned it is much slower than default

This commit is contained in:
Adrian Cole 2010-02-10 12:22:37 -08:00
parent 752ab1c136
commit c8f5d36c14
6 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
aws/perftest/pom.xml
View File

@ -48,12 +48,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jclouds-joda</artifactId> <artifactId>jclouds-apachehc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-bouncycastle</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

6
aws/perftest/src/test/java/org/jclouds/aws/s3/JCloudsEnterprisePerformanceLiveTest.java → aws/perftest/src/test/java/org/jclouds/aws/s3/JCloudsApacheHCPerformanceLiveTest.java
View File

@ -29,13 +29,14 @@ import java.util.Properties;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import org.jclouds.enterprise.config.EnterpriseConfigurationModule; import org.jclouds.enterprise.config.EnterpriseConfigurationModule;
import org.jclouds.http.apachehc.config.ApacheHCHttpCommandExecutorServiceModule;
import org.jclouds.logging.config.NullLoggingModule; import org.jclouds.logging.config.NullLoggingModule;
import org.testng.ITestContext; import org.testng.ITestContext;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@Test(sequential = true, testName = "perftest.JCloudsNioPerformanceLiveTest", groups = { "live" }) @Test(sequential = true, testName = "perftest.JCloudsNioPerformanceLiveTest", groups = { "live" })
public class JCloudsEnterprisePerformanceLiveTest extends BaseJCloudsPerformanceLiveTest { public class JCloudsApacheHCPerformanceLiveTest extends BaseJCloudsPerformanceLiveTest {
@Override @Override
@BeforeClass(groups = { "integration", "live" }) @BeforeClass(groups = { "integration", "live" })
@ -53,7 +54,8 @@ public class JCloudsEnterprisePerformanceLiveTest extends BaseJCloudsPerformance
String contextName = "enterprise"; String contextName = "enterprise";
overrideWithSysPropertiesAndPrint(overrides, contextName); overrideWithSysPropertiesAndPrint(overrides, contextName);
context = S3ContextFactory.createContext(overrides, accesskeyid, secretkey, context = S3ContextFactory.createContext(overrides, accesskeyid, secretkey,
new NullLoggingModule(), new EnterpriseConfigurationModule()); new NullLoggingModule(), new ApacheHCHttpCommandExecutorServiceModule(),
new EnterpriseConfigurationModule());
} }
@Override @Override

7
aws/perftest/src/test/java/org/jclouds/aws/s3/JCloudsGaePerformanceLiveTest.java
View File

@ -27,8 +27,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.date.joda.config.JodaDateServiceModule; import org.jclouds.enterprise.config.EnterpriseConfigurationModule;
import org.jclouds.encryption.bouncycastle.config.BouncyCastleEncryptionServiceModule;
import org.jclouds.gae.config.GoogleAppEngineConfigurationModule; import org.jclouds.gae.config.GoogleAppEngineConfigurationModule;
import org.jclouds.logging.config.NullLoggingModule; import org.jclouds.logging.config.NullLoggingModule;
import org.testng.annotations.AfterClass; import org.testng.annotations.AfterClass;
@ -192,8 +191,8 @@ public class JCloudsGaePerformanceLiveTest extends BaseJCloudsPerformanceLiveTes
String contextName = "gae"; String contextName = "gae";
overrideWithSysPropertiesAndPrint(overrides, contextName); overrideWithSysPropertiesAndPrint(overrides, contextName);
this.perfContext = S3ContextFactory.createContext(overrides, accesskeyid, secretkey, this.perfContext = S3ContextFactory.createContext(overrides, accesskeyid, secretkey,
new NullLoggingModule(), new BouncyCastleEncryptionServiceModule(), new NullLoggingModule(), new EnterpriseConfigurationModule(),
new JodaDateServiceModule(), new GoogleAppEngineConfigurationModule()); new GoogleAppEngineConfigurationModule());
} }
@AfterClass(groups = { "live" }) @AfterClass(groups = { "live" })

7
aws/perftest/src/test/java/org/jclouds/aws/s3/JCloudsNioPerformanceLiveTest.java
View File

@ -26,8 +26,7 @@ import static org.jclouds.Constants.PROPERTY_USER_THREADS;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import org.jclouds.date.joda.config.JodaDateServiceModule; import org.jclouds.enterprise.config.EnterpriseConfigurationModule;
import org.jclouds.encryption.bouncycastle.config.BouncyCastleEncryptionServiceModule;
import org.jclouds.http.httpnio.config.NioTransformingHttpCommandExecutorServiceModule; import org.jclouds.http.httpnio.config.NioTransformingHttpCommandExecutorServiceModule;
import org.jclouds.logging.config.NullLoggingModule; import org.jclouds.logging.config.NullLoggingModule;
import org.testng.ITestContext; import org.testng.ITestContext;
@ -51,8 +50,8 @@ public class JCloudsNioPerformanceLiveTest extends BaseJCloudsPerformanceLiveTes
String contextName = "nio"; String contextName = "nio";
overrideWithSysPropertiesAndPrint(overrides, contextName); overrideWithSysPropertiesAndPrint(overrides, contextName);
context = S3ContextFactory.createContext(overrides, accesskeyid, secretkey, context = S3ContextFactory.createContext(overrides, accesskeyid, secretkey,
new NullLoggingModule(), new BouncyCastleEncryptionServiceModule(), new NullLoggingModule(), new EnterpriseConfigurationModule(),
new JodaDateServiceModule(), new NioTransformingHttpCommandExecutorServiceModule()); new NioTransformingHttpCommandExecutorServiceModule());
} }
@Override @Override

5
extensions/enterprise/pom.xml
View File

@ -32,11 +32,6 @@
<description>jclouds enterprise configuration</description> <description>jclouds enterprise configuration</description>
<dependencies> <dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-apachehc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jclouds-joda</artifactId> <artifactId>jclouds-joda</artifactId>

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

@ -24,8 +24,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.apachehc.config.ApacheHCHttpCommandExecutorServiceModule;
import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
/** /**
* Configures Enterprise-grade components * Configures Enterprise-grade components
@ -34,7 +32,6 @@ import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
* *
*/ */
@ConfiguresExecutorService @ConfiguresExecutorService
@ConfiguresHttpCommandExecutorService
public class EnterpriseConfigurationModule extends ExecutorServiceModule { public class EnterpriseConfigurationModule extends ExecutorServiceModule {
public EnterpriseConfigurationModule(ExecutorService userThreads, ExecutorService ioThreads) { public EnterpriseConfigurationModule(ExecutorService userThreads, ExecutorService ioThreads) {
@ -49,7 +46,6 @@ public class EnterpriseConfigurationModule extends ExecutorServiceModule {
protected void configure() { protected void configure() {
install(new BouncyCastleEncryptionServiceModule()); install(new BouncyCastleEncryptionServiceModule());
install(new JodaDateServiceModule()); install(new JodaDateServiceModule());
install(new ApacheHCHttpCommandExecutorServiceModule());
} }
} }