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

renamed properties builder for aws-elb

This commit is contained in:
Adrian Cole 2011-01-30 13:41:21 -08:00
parent b62a6309be
commit 3263d22bfc
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/resources/rest.properties
View File

@ -48,7 +48,7 @@ elb.contextbuilder=org.jclouds.elb.ELBContextBuilder
elb.propertiesbuilder=org.jclouds.elb.ELBPropertiesBuilder
aws-elb.contextbuilder=org.jclouds.elb.ELBContextBuilder
aws-elb.propertiesbuilder=org.jclouds.aws.elb.ELBPropertiesBuilder
aws-elb.propertiesbuilder=org.jclouds.aws.elb.AWSELBPropertiesBuilder
cloudwatch.contextbuilder=org.jclouds.cloudwatch.CloudWatchContextBuilder
cloudwatch.propertiesbuilder=org.jclouds.cloudwatch.CloudWatchPropertiesBuilder

7
providers/aws-elb/src/main/java/org/jclouds/aws/elb/ELBPropertiesBuilder.java → providers/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBPropertiesBuilder.java
View File

@ -35,6 +35,7 @@ import java.util.Set;
import org.jclouds.aws.domain.Region;
import org.jclouds.elb.ELBAsyncClient;
import org.jclouds.elb.ELBPropertiesBuilder;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableSet;
@ -44,7 +45,7 @@ import com.google.common.collect.ImmutableSet;
*
* @author Adrian Cole
*/
public class ELBPropertiesBuilder extends org.jclouds.elb.ELBPropertiesBuilder {
public class AWSELBPropertiesBuilder extends ELBPropertiesBuilder {
public static Set<String> DEFAULT_REGIONS = ImmutableSet.of(EU_WEST_1, US_EAST_1, US_WEST_1, AP_SOUTHEAST_1);
@Override
@ -66,11 +67,11 @@ public class ELBPropertiesBuilder extends org.jclouds.elb.ELBPropertiesBuilder {
return properties;
}
public ELBPropertiesBuilder() {
public AWSELBPropertiesBuilder() {
super();
}
public ELBPropertiesBuilder(Properties properties) {
public AWSELBPropertiesBuilder(Properties properties) {
super(properties);
}

6
providers/aws-elb/src/test/java/org/jclouds/aws/elb/AWSELBClientLiveTest.java
View File

@ -35,21 +35,21 @@ public class AWSELBClientLiveTest extends ELBClientLiveTest {
@Test
public void testCreateLoadBalancer() {
for (String region : ELBPropertiesBuilder.DEFAULT_REGIONS) {
for (String region : AWSELBPropertiesBuilder.DEFAULT_REGIONS) {
createLoadBalancerInRegionZone(region, region + "a", name);
}
}
@Test(dependsOnMethods = "testCreateLoadBalancer")
public void testDescribeLoadBalancers() {
for (String region : ELBPropertiesBuilder.DEFAULT_REGIONS) {
for (String region : AWSELBPropertiesBuilder.DEFAULT_REGIONS) {
describeLoadBalancerInRegion(region);
}
}
@Test
public void testDeleteLoadBalancer() {
for (String region : ELBPropertiesBuilder.DEFAULT_REGIONS) {
for (String region : AWSELBPropertiesBuilder.DEFAULT_REGIONS) {
deleteLoadBalancerInRegion(region);
}
}

2
providers/aws-elb/src/test/java/org/jclouds/aws/elb/ELBAsyncClientTest.java
View File

@ -19,7 +19,7 @@
package org.jclouds.aws.elb;
import static org.jclouds.aws.elb.ELBPropertiesBuilder.DEFAULT_REGIONS;
import static org.jclouds.aws.elb.AWSELBPropertiesBuilder.DEFAULT_REGIONS;
import java.io.IOException;
import java.lang.reflect.Method;