mirror of https://github.com/apache/jclouds.git
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:
parent
752ab1c136
commit
c8f5d36c14
|
@ -48,12 +48,7 @@
|
|||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>jclouds-joda</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>jclouds-bouncycastle</artifactId>
|
||||
<artifactId>jclouds-apachehc</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -29,13 +29,14 @@ import java.util.Properties;
|
|||
import java.util.concurrent.Executors;
|
||||
|
||||
import org.jclouds.enterprise.config.EnterpriseConfigurationModule;
|
||||
import org.jclouds.http.apachehc.config.ApacheHCHttpCommandExecutorServiceModule;
|
||||
import org.jclouds.logging.config.NullLoggingModule;
|
||||
import org.testng.ITestContext;
|
||||
import org.testng.annotations.BeforeClass;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
@Test(sequential = true, testName = "perftest.JCloudsNioPerformanceLiveTest", groups = { "live" })
|
||||
public class JCloudsEnterprisePerformanceLiveTest extends BaseJCloudsPerformanceLiveTest {
|
||||
public class JCloudsApacheHCPerformanceLiveTest extends BaseJCloudsPerformanceLiveTest {
|
||||
|
||||
@Override
|
||||
@BeforeClass(groups = { "integration", "live" })
|
||||
|
@ -53,7 +54,8 @@ public class JCloudsEnterprisePerformanceLiveTest extends BaseJCloudsPerformance
|
|||
String contextName = "enterprise";
|
||||
overrideWithSysPropertiesAndPrint(overrides, contextName);
|
||||
context = S3ContextFactory.createContext(overrides, accesskeyid, secretkey,
|
||||
new NullLoggingModule(), new EnterpriseConfigurationModule());
|
||||
new NullLoggingModule(), new ApacheHCHttpCommandExecutorServiceModule(),
|
||||
new EnterpriseConfigurationModule());
|
||||
}
|
||||
|
||||
@Override
|
|
@ -27,8 +27,7 @@ import java.util.concurrent.Future;
|
|||
import java.util.concurrent.TimeoutException;
|
||||
|
||||
import org.jclouds.blobstore.BlobStoreContext;
|
||||
import org.jclouds.date.joda.config.JodaDateServiceModule;
|
||||
import org.jclouds.encryption.bouncycastle.config.BouncyCastleEncryptionServiceModule;
|
||||
import org.jclouds.enterprise.config.EnterpriseConfigurationModule;
|
||||
import org.jclouds.gae.config.GoogleAppEngineConfigurationModule;
|
||||
import org.jclouds.logging.config.NullLoggingModule;
|
||||
import org.testng.annotations.AfterClass;
|
||||
|
@ -192,8 +191,8 @@ public class JCloudsGaePerformanceLiveTest extends BaseJCloudsPerformanceLiveTes
|
|||
String contextName = "gae";
|
||||
overrideWithSysPropertiesAndPrint(overrides, contextName);
|
||||
this.perfContext = S3ContextFactory.createContext(overrides, accesskeyid, secretkey,
|
||||
new NullLoggingModule(), new BouncyCastleEncryptionServiceModule(),
|
||||
new JodaDateServiceModule(), new GoogleAppEngineConfigurationModule());
|
||||
new NullLoggingModule(), new EnterpriseConfigurationModule(),
|
||||
new GoogleAppEngineConfigurationModule());
|
||||
}
|
||||
|
||||
@AfterClass(groups = { "live" })
|
||||
|
|
|
@ -26,8 +26,7 @@ import static org.jclouds.Constants.PROPERTY_USER_THREADS;
|
|||
import java.util.Properties;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
import org.jclouds.date.joda.config.JodaDateServiceModule;
|
||||
import org.jclouds.encryption.bouncycastle.config.BouncyCastleEncryptionServiceModule;
|
||||
import org.jclouds.enterprise.config.EnterpriseConfigurationModule;
|
||||
import org.jclouds.http.httpnio.config.NioTransformingHttpCommandExecutorServiceModule;
|
||||
import org.jclouds.logging.config.NullLoggingModule;
|
||||
import org.testng.ITestContext;
|
||||
|
@ -51,8 +50,8 @@ public class JCloudsNioPerformanceLiveTest extends BaseJCloudsPerformanceLiveTes
|
|||
String contextName = "nio";
|
||||
overrideWithSysPropertiesAndPrint(overrides, contextName);
|
||||
context = S3ContextFactory.createContext(overrides, accesskeyid, secretkey,
|
||||
new NullLoggingModule(), new BouncyCastleEncryptionServiceModule(),
|
||||
new JodaDateServiceModule(), new NioTransformingHttpCommandExecutorServiceModule());
|
||||
new NullLoggingModule(), new EnterpriseConfigurationModule(),
|
||||
new NioTransformingHttpCommandExecutorServiceModule());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -32,11 +32,6 @@
|
|||
<description>jclouds enterprise configuration</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>jclouds-apachehc</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>jclouds-joda</artifactId>
|
||||
|
|
|
@ -24,8 +24,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.apachehc.config.ApacheHCHttpCommandExecutorServiceModule;
|
||||
import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
|
||||
|
||||
/**
|
||||
* Configures Enterprise-grade components
|
||||
|
@ -34,7 +32,6 @@ import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
|
|||
*
|
||||
*/
|
||||
@ConfiguresExecutorService
|
||||
@ConfiguresHttpCommandExecutorService
|
||||
public class EnterpriseConfigurationModule extends ExecutorServiceModule {
|
||||
|
||||
public EnterpriseConfigurationModule(ExecutorService userThreads, ExecutorService ioThreads) {
|
||||
|
@ -49,7 +46,6 @@ public class EnterpriseConfigurationModule extends ExecutorServiceModule {
|
|||
protected void configure() {
|
||||
install(new BouncyCastleEncryptionServiceModule());
|
||||
install(new JodaDateServiceModule());
|
||||
install(new ApacheHCHttpCommandExecutorServiceModule());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue