Issue 440: moved ec2 into its own api module

allcompute/pom.xml

@@ -30,8 +30,8 @@
     <name>allcompute</name>
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-aws</artifactId>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>ec2</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

apis/ec2/pom.xml

@@ -75,6 +75,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-jsch</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

apis/ec2/src/main/clojure/org/jclouds/ec2/ebs.clj

@@ -20,7 +20,7 @@
 (ns 
   #^{:author "Chas Emerick, cemerick@snowtide.com"
      :doc "A clojure binding to the jclouds EBS service interface."}
-  org.jclouds.aws.ebs
+  org.jclouds.ec2.ebs
   (:require (org.jclouds [compute :as compute]))
   (:use (clojure.contrib def core))
   (:import org.jclouds.aws.domain.Region

apis/ec2/src/main/clojure/org/jclouds/ec2/elastic_ip.clj

@@ -20,7 +20,7 @@
 (ns 
   #^{:author "Chas Emerick, cemerick@snowtide.com"
      :doc "A clojure binding for the jclouds AWS elastic IP address interface."}
-  org.jclouds.aws.elastic-ip
+  org.jclouds.ec2.elastic-ip
   (:require (org.jclouds [compute :as compute])
     [org.jclouds.aws.ebs :as ebs])
   (:use (clojure.contrib def core))

apis/ec2/src/main/java/org/jclouds/ec2/EC2AsyncClient.java

@@ -17,18 +17,18 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2;
+package org.jclouds.ec2;
 
-import org.jclouds.aws.ec2.services.AMIAsyncClient;
-import org.jclouds.aws.ec2.services.AvailabilityZoneAndRegionAsyncClient;
-import org.jclouds.aws.ec2.services.ElasticBlockStoreAsyncClient;
-import org.jclouds.aws.ec2.services.ElasticIPAddressAsyncClient;
-import org.jclouds.aws.ec2.services.InstanceAsyncClient;
-import org.jclouds.aws.ec2.services.KeyPairAsyncClient;
-import org.jclouds.aws.ec2.services.MonitoringAsyncClient;
-import org.jclouds.aws.ec2.services.PlacementGroupAsyncClient;
-import org.jclouds.aws.ec2.services.SecurityGroupAsyncClient;
-import org.jclouds.aws.ec2.services.WindowsAsyncClient;
+import org.jclouds.ec2.services.AMIAsyncClient;
+import org.jclouds.ec2.services.AvailabilityZoneAndRegionAsyncClient;
+import org.jclouds.ec2.services.ElasticBlockStoreAsyncClient;
+import org.jclouds.ec2.services.ElasticIPAddressAsyncClient;
+import org.jclouds.ec2.services.InstanceAsyncClient;
+import org.jclouds.ec2.services.KeyPairAsyncClient;
+import org.jclouds.ec2.services.MonitoringAsyncClient;
+import org.jclouds.ec2.services.PlacementGroupAsyncClient;
+import org.jclouds.ec2.services.SecurityGroupAsyncClient;
+import org.jclouds.ec2.services.WindowsAsyncClient;
 import org.jclouds.rest.annotations.Delegate;
 
 /**

apis/ec2/src/main/java/org/jclouds/ec2/EC2Client.java

@@ -17,20 +17,20 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2;
+package org.jclouds.ec2;
 
 import java.util.concurrent.TimeUnit;
 
-import org.jclouds.aws.ec2.services.AMIClient;
-import org.jclouds.aws.ec2.services.AvailabilityZoneAndRegionClient;
-import org.jclouds.aws.ec2.services.ElasticBlockStoreClient;
-import org.jclouds.aws.ec2.services.ElasticIPAddressClient;
-import org.jclouds.aws.ec2.services.InstanceClient;
-import org.jclouds.aws.ec2.services.KeyPairClient;
-import org.jclouds.aws.ec2.services.MonitoringClient;
-import org.jclouds.aws.ec2.services.PlacementGroupClient;
-import org.jclouds.aws.ec2.services.SecurityGroupClient;
-import org.jclouds.aws.ec2.services.WindowsClient;
+import org.jclouds.ec2.services.AMIClient;
+import org.jclouds.ec2.services.AvailabilityZoneAndRegionClient;
+import org.jclouds.ec2.services.ElasticBlockStoreClient;
+import org.jclouds.ec2.services.ElasticIPAddressClient;
+import org.jclouds.ec2.services.InstanceClient;
+import org.jclouds.ec2.services.KeyPairClient;
+import org.jclouds.ec2.services.MonitoringClient;
+import org.jclouds.ec2.services.PlacementGroupClient;
+import org.jclouds.ec2.services.SecurityGroupClient;
+import org.jclouds.ec2.services.WindowsClient;
 import org.jclouds.concurrent.Timeout;
 import org.jclouds.rest.annotations.Delegate;
 

apis/ec2/src/main/java/org/jclouds/ec2/EC2ContextBuilder.java

@@ -17,14 +17,14 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2;
+package org.jclouds.ec2;
 
 import java.util.List;
 import java.util.Properties;
 
-import org.jclouds.aws.ec2.compute.config.EC2ComputeServiceContextModule;
-import org.jclouds.aws.ec2.compute.config.EC2ResolveImagesModule;
-import org.jclouds.aws.ec2.config.EC2RestClientModule;
+import org.jclouds.ec2.compute.config.EC2ComputeServiceContextModule;
+import org.jclouds.ec2.compute.config.EC2ResolveImagesModule;
+import org.jclouds.ec2.config.EC2RestClientModule;
 import org.jclouds.compute.ComputeServiceContextBuilder;
 import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
 import org.jclouds.logging.jdk.config.JDKLoggingModule;

apis/ec2/src/main/java/org/jclouds/ec2/EC2PropertiesBuilder.java

@@ -17,16 +17,16 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2;
+package org.jclouds.ec2;
 
 import static org.jclouds.Constants.PROPERTY_API_VERSION;
 import static org.jclouds.Constants.PROPERTY_ENDPOINT;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_ELB_ENDPOINT;
 import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AUTH_TAG;
 import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG;
 import static org.jclouds.compute.reference.ComputeServiceConstants.PROPERTY_TIMEOUT_NODE_SUSPENDED;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_ELB_ENDPOINT;
 
 import java.util.Properties;
 

apis/ec2/src/main/java/org/jclouds/ec2/EucalyptusPropertiesBuilder.java

@@ -17,11 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2;
+package org.jclouds.ec2;
 
 import static org.jclouds.Constants.PROPERTY_ENDPOINT;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
 import static org.jclouds.compute.reference.ComputeServiceConstants.PROPERTY_TIMEOUT_PORT_OPEN;
 
 import java.util.Properties;

apis/ec2/src/main/java/org/jclouds/ec2/NovaPropertiesBuilder.java

@@ -17,11 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2;
+package org.jclouds.ec2;
 
 import static org.jclouds.Constants.PROPERTY_ENDPOINT;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
 
 import java.util.Properties;
 

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParams.java

@@ -17,14 +17,14 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
+package org.jclouds.ec2.binders;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.lang.String.format;
 
-import org.jclouds.aws.ec2.domain.BlockDeviceMapping;
-import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.ec2.domain.BlockDeviceMapping;
+import org.jclouds.ec2.domain.RunningInstance;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.utils.ModifyRequest;
 import org.jclouds.rest.Binder;

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindBundleIdsToIndexedFormParams.java

@@ -17,12 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.indexStringArrayToFormValuesWithPrefix;
+package org.jclouds.ec2.binders;
 
 import javax.inject.Singleton;
 
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
 
@@ -35,7 +34,7 @@ import org.jclouds.rest.Binder;
 public class BindBundleIdsToIndexedFormParams implements Binder {
    @Override
    public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      return indexStringArrayToFormValuesWithPrefix(request, "BundleId", input);
+      return AWSUtils.indexStringArrayToFormValuesWithPrefix(request, "BundleId", input);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindGroupNamesToIndexedFormParams.java

@@ -17,12 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.indexStringArrayToFormValuesWithPrefix;
+package org.jclouds.ec2.binders;
 
 import javax.inject.Singleton;
 
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
 
@@ -35,7 +34,7 @@ import org.jclouds.rest.Binder;
 public class BindGroupNamesToIndexedFormParams implements Binder {
    @Override
    public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      return indexStringArrayToFormValuesWithPrefix(request, "GroupName", input);
+      return AWSUtils.indexStringArrayToFormValuesWithPrefix(request, "GroupName", input);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindInstanceIdsToIndexedFormParams.java

@@ -17,12 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.indexStringArrayToFormValuesWithPrefix;
+package org.jclouds.ec2.binders;
 
 import javax.inject.Singleton;
 
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
 
@@ -35,7 +34,7 @@ import org.jclouds.rest.Binder;
 public class BindInstanceIdsToIndexedFormParams implements Binder {
    @Override
    public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      return indexStringArrayToFormValuesWithPrefix(request, "InstanceId", input);
+      return AWSUtils.indexStringArrayToFormValuesWithPrefix(request, "InstanceId", input);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindKeyNamesToIndexedFormParams.java

@@ -17,12 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.indexStringArrayToFormValuesWithPrefix;
+package org.jclouds.ec2.binders;
 
 import javax.inject.Singleton;
 
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
 
@@ -35,7 +34,7 @@ import org.jclouds.rest.Binder;
 public class BindKeyNamesToIndexedFormParams implements Binder {
    @Override
    public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      return indexStringArrayToFormValuesWithPrefix(request, "KeyName", input);
+      return AWSUtils.indexStringArrayToFormValuesWithPrefix(request, "KeyName", input);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindProductCodesToIndexedFormParams.java

@@ -17,12 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.indexIterableToFormValuesWithPrefix;
+package org.jclouds.ec2.binders;
 
 import javax.inject.Singleton;
 
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
 
@@ -35,7 +34,7 @@ import org.jclouds.rest.Binder;
 public class BindProductCodesToIndexedFormParams implements Binder {
    @Override
    public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      return indexIterableToFormValuesWithPrefix(request, "ProductCode", input);
+      return AWSUtils.indexIterableToFormValuesWithPrefix(request, "ProductCode", input);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindPublicIpsToIndexedFormParams.java

@@ -17,14 +17,14 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
+package org.jclouds.ec2.binders;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.aws.ec2.util.EC2Utils.indexStringArrayToFormValuesWithPrefix;
 
 import javax.inject.Singleton;
 
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
 
@@ -40,6 +40,6 @@ public class BindPublicIpsToIndexedFormParams implements Binder {
       checkArgument(checkNotNull(input, "input") instanceof String[], "this binder is only valid for String[] : "
             + input.getClass());
       String[] addressStrings = (String[]) input;
-      return indexStringArrayToFormValuesWithPrefix(request, "PublicIp", addressStrings);
+      return AWSUtils.indexStringArrayToFormValuesWithPrefix(request, "PublicIp", addressStrings);
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindS3UploadPolicyAndSignature.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
+package org.jclouds.ec2.binders;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -57,4 +57,4 @@ public class BindS3UploadPolicyAndSignature implements Binder {
       return ModifyRequest.putFormParams(request, builder.build());
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserGroupsToIndexedFormParams.java

@@ -17,14 +17,14 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
+package org.jclouds.ec2.binders;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.aws.ec2.util.EC2Utils.indexIterableToFormValuesWithPrefix;
 
 import javax.inject.Singleton;
 
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
 
@@ -42,7 +42,7 @@ public class BindUserGroupsToIndexedFormParams implements Binder {
       checkArgument(checkNotNull(input, "input") instanceof Iterable<?>, "this binder is only valid for Iterable<?>: "
             + input.getClass());
       checkValidUserGroup(input);
-      return indexIterableToFormValuesWithPrefix(request, "UserGroup", input);
+      return AWSUtils.indexIterableToFormValuesWithPrefix(request, "UserGroup", input);
    }
 
    private void checkValidUserGroup(Object input) {
@@ -52,4 +52,4 @@ public class BindUserGroupsToIndexedFormParams implements Binder {
             "only supported UserGroup is 'all'");
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParams.java

@@ -17,14 +17,14 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
+package org.jclouds.ec2.binders;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.domain.UserIdGroupPair;
+import org.jclouds.ec2.domain.UserIdGroupPair;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.utils.ModifyRequest;
 import org.jclouds.rest.Binder;
@@ -50,4 +50,4 @@ public class BindUserIdGroupPairToSourceSecurityGroupFormParams implements Binde
       return ModifyRequest.putFormParams(request, builder.build());
 
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdsToIndexedFormParams.java

@@ -17,12 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.indexIterableToFormValuesWithPrefix;
+package org.jclouds.ec2.binders;
 
 import javax.inject.Singleton;
 
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
 
@@ -35,7 +34,7 @@ import org.jclouds.rest.Binder;
 public class BindUserIdsToIndexedFormParams implements Binder {
    @Override
    public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      return indexIterableToFormValuesWithPrefix(request, "UserId", input);
+      return AWSUtils.indexIterableToFormValuesWithPrefix(request, "UserId", input);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/BindVolumeIdsToIndexedFormParams.java

@@ -17,12 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.indexStringArrayToFormValuesWithPrefix;
+package org.jclouds.ec2.binders;
 
 import javax.inject.Singleton;
 
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
 
@@ -35,7 +34,7 @@ import org.jclouds.rest.Binder;
 public class BindVolumeIdsToIndexedFormParams implements Binder {
    @Override
    public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      return indexStringArrayToFormValuesWithPrefix(request, "VolumeId", input);
+      return AWSUtils.indexStringArrayToFormValuesWithPrefix(request, "VolumeId", input);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/binders/IfNotNullBindAvailabilityZoneToFormParam.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.binders;
+package org.jclouds.ec2.binders;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -43,4 +43,4 @@ public class IfNotNullBindAvailabilityZoneToFormParam implements Binder {
       return request;
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java

@@ -17,10 +17,9 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute;
+package org.jclouds.ec2.compute;
 
 import static com.google.common.base.Preconditions.checkState;
-import static org.jclouds.aws.ec2.util.EC2Utils.parseHandle;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -34,13 +33,7 @@ import javax.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.aws.AWSResponseException;
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
-import org.jclouds.aws.ec2.compute.domain.RegionNameAndIngressRules;
-import org.jclouds.aws.ec2.compute.options.EC2TemplateOptions;
-import org.jclouds.aws.ec2.domain.KeyPair;
-import org.jclouds.aws.ec2.domain.PlacementGroup;
-import org.jclouds.aws.ec2.domain.PlacementGroup.State;
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.collect.Memoized;
 import org.jclouds.compute.ComputeServiceContext;
 import org.jclouds.compute.domain.Hardware;
@@ -60,6 +53,13 @@ import org.jclouds.compute.strategy.SuspendNodeStrategy;
 import org.jclouds.compute.util.ComputeUtils;
 import org.jclouds.domain.Credentials;
 import org.jclouds.domain.Location;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.compute.domain.RegionNameAndIngressRules;
+import org.jclouds.ec2.compute.options.EC2TemplateOptions;
+import org.jclouds.ec2.domain.KeyPair;
+import org.jclouds.ec2.domain.PlacementGroup;
+import org.jclouds.ec2.domain.PlacementGroup.State;
 import org.jclouds.http.HttpResponseException;
 import org.jclouds.util.Preconditions2;
 
@@ -171,7 +171,7 @@ public class EC2ComputeService extends BaseComputeService {
       Map<String, String> regionTags = Maps.newHashMap();
       for (NodeMetadata nodeMetadata : deadOnes) {
          if (nodeMetadata.getTag() != null)
-            regionTags.put(parseHandle(nodeMetadata.getId())[0], nodeMetadata.getTag());
+            regionTags.put(AWSUtils.parseHandle(nodeMetadata.getId())[0], nodeMetadata.getTag());
       }
       for (Entry<String, String> regionTag : regionTags.entrySet()) {
          deleteKeyPair(regionTag.getKey(), regionTag.getValue());
@@ -189,4 +189,4 @@ public class EC2ComputeService extends BaseComputeService {
       return EC2TemplateOptions.class.cast(super.templateOptions());
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2BindComputeStrategiesByClass.java

@@ -17,15 +17,15 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.config;
+package org.jclouds.ec2.compute.config;
 
-import org.jclouds.aws.ec2.compute.strategy.EC2DestroyNodeStrategy;
-import org.jclouds.aws.ec2.compute.strategy.EC2GetNodeMetadataStrategy;
-import org.jclouds.aws.ec2.compute.strategy.EC2ListNodesStrategy;
-import org.jclouds.aws.ec2.compute.strategy.EC2RebootNodeStrategy;
-import org.jclouds.aws.ec2.compute.strategy.EC2RunNodesAndAddToSetStrategy;
-import org.jclouds.aws.ec2.compute.strategy.EC2ResumeNodeStrategy;
-import org.jclouds.aws.ec2.compute.strategy.EC2SuspendNodeStrategy;
+import org.jclouds.ec2.compute.strategy.EC2DestroyNodeStrategy;
+import org.jclouds.ec2.compute.strategy.EC2GetNodeMetadataStrategy;
+import org.jclouds.ec2.compute.strategy.EC2ListNodesStrategy;
+import org.jclouds.ec2.compute.strategy.EC2RebootNodeStrategy;
+import org.jclouds.ec2.compute.strategy.EC2RunNodesAndAddToSetStrategy;
+import org.jclouds.ec2.compute.strategy.EC2ResumeNodeStrategy;
+import org.jclouds.ec2.compute.strategy.EC2SuspendNodeStrategy;
 import org.jclouds.compute.config.BindComputeStrategiesByClass;
 import org.jclouds.compute.strategy.AddNodeWithTagStrategy;
 import org.jclouds.compute.strategy.DestroyNodeStrategy;
@@ -90,4 +90,4 @@ public class EC2BindComputeStrategiesByClass extends BindComputeStrategiesByClas
       return EC2SuspendNodeStrategy.class;
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2BindComputeSuppliersByClass.java

@@ -17,12 +17,12 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.config;
+package org.jclouds.ec2.compute.config;
 
 import java.util.Set;
 
-import org.jclouds.aws.ec2.compute.suppliers.EC2HardwareSupplier;
-import org.jclouds.aws.ec2.compute.suppliers.EC2ImageSupplier;
+import org.jclouds.ec2.compute.suppliers.EC2HardwareSupplier;
+import org.jclouds.ec2.compute.suppliers.EC2ImageSupplier;
 import org.jclouds.compute.config.BindComputeSuppliersByClass;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;
@@ -54,4 +54,4 @@ public class EC2BindComputeSuppliersByClass extends BindComputeSuppliersByClass
    protected Class<? extends Supplier<Set<? extends Location>>> defineLocationSupplier() {
       return ZoneToRegionToProviderOrJustProvider.class;
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.config;
+package org.jclouds.ec2.compute.config;
 
 import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
 import static org.jclouds.compute.domain.OsFamily.AMZN_LINUX;
@@ -28,9 +28,9 @@ import java.util.Map;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.compute.EC2ComputeService;
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
-import org.jclouds.aws.ec2.compute.suppliers.RegionAndNameToImageSupplier;
+import org.jclouds.ec2.compute.EC2ComputeService;
+import org.jclouds.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.compute.suppliers.RegionAndNameToImageSupplier;
 import org.jclouds.compute.ComputeServiceContext;
 import org.jclouds.compute.config.BaseComputeServiceContextModule;
 import org.jclouds.compute.domain.Image;
@@ -60,7 +60,7 @@ public class EC2ComputeServiceContextModule extends BaseComputeServiceContextMod
    @Override
    protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
       String provider = injector.getInstance(Key.get(String.class, Provider.class));
-      if ("ec2".equals(provider) || "aws-ec2".equals(provider))
+      if ("ec2".equals(provider) || "ec2".equals(provider))
          return template.osFamily(AMZN_LINUX).os64Bit(true);
       else if ("nova".equals(provider))
          return super.provideTemplate(injector, template);

apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java

@@ -17,12 +17,12 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.config;
+package org.jclouds.ec2.compute.config;
 
 import static com.google.common.collect.Iterables.toArray;
 import static com.google.common.collect.Maps.newLinkedHashMap;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
 
 import java.security.SecureRandom;
 import java.util.Map;
@@ -31,25 +31,25 @@ import java.util.concurrent.TimeUnit;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2AsyncClient;
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.compute.EC2ComputeService;
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
-import org.jclouds.aws.ec2.compute.functions.CreatePlacementGroupIfNeeded;
-import org.jclouds.aws.ec2.compute.functions.CreateSecurityGroupIfNeeded;
-import org.jclouds.aws.ec2.compute.functions.CreateUniqueKeyPair;
-import org.jclouds.aws.ec2.compute.functions.CredentialsForInstance;
-import org.jclouds.aws.ec2.compute.functions.RegionAndIdToImage;
-import org.jclouds.aws.ec2.compute.functions.RunningInstanceToNodeMetadata;
-import org.jclouds.aws.ec2.compute.internal.EC2TemplateBuilderImpl;
-import org.jclouds.aws.ec2.compute.options.EC2TemplateOptions;
-import org.jclouds.aws.ec2.domain.InstanceState;
-import org.jclouds.aws.ec2.domain.KeyPair;
-import org.jclouds.aws.ec2.domain.PlacementGroup;
-import org.jclouds.aws.ec2.domain.RunningInstance;
-import org.jclouds.aws.ec2.predicates.InstancePresent;
-import org.jclouds.aws.ec2.predicates.PlacementGroupAvailable;
-import org.jclouds.aws.ec2.predicates.PlacementGroupDeleted;
+import org.jclouds.ec2.EC2AsyncClient;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.compute.EC2ComputeService;
+import org.jclouds.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.compute.functions.CreatePlacementGroupIfNeeded;
+import org.jclouds.ec2.compute.functions.CreateSecurityGroupIfNeeded;
+import org.jclouds.ec2.compute.functions.CreateUniqueKeyPair;
+import org.jclouds.ec2.compute.functions.CredentialsForInstance;
+import org.jclouds.ec2.compute.functions.RegionAndIdToImage;
+import org.jclouds.ec2.compute.functions.RunningInstanceToNodeMetadata;
+import org.jclouds.ec2.compute.internal.EC2TemplateBuilderImpl;
+import org.jclouds.ec2.compute.options.EC2TemplateOptions;
+import org.jclouds.ec2.domain.InstanceState;
+import org.jclouds.ec2.domain.KeyPair;
+import org.jclouds.ec2.domain.PlacementGroup;
+import org.jclouds.ec2.domain.RunningInstance;
+import org.jclouds.ec2.predicates.InstancePresent;
+import org.jclouds.ec2.predicates.PlacementGroupAvailable;
+import org.jclouds.ec2.predicates.PlacementGroupDeleted;
 import org.jclouds.compute.ComputeService;
 import org.jclouds.compute.ComputeServiceContext;
 import org.jclouds.compute.domain.Image;

apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ResolveImagesModule.java

@@ -17,11 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.config;
+package org.jclouds.ec2.compute.config;
 
 import com.google.inject.AbstractModule;
 
-import org.jclouds.aws.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy;
+import org.jclouds.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy;
 import org.jclouds.compute.config.ResolvesImages;
 import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy;
 

apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/EC2HardwareBuilder.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.domain;
+package org.jclouds.ec2.compute.domain;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -28,8 +28,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import org.jclouds.aws.ec2.domain.InstanceType;
-import org.jclouds.aws.ec2.domain.RootDeviceType;
+import org.jclouds.ec2.domain.InstanceType;
+import org.jclouds.ec2.domain.RootDeviceType;
 import org.jclouds.compute.domain.HardwareBuilder;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.Processor;

apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.domain;
+package org.jclouds.ec2.compute.domain;
 
 /**
  * 

apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionNameAndIngressRules.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.domain;
+package org.jclouds.ec2.compute.domain;
 
 /**
  * 
@@ -44,4 +44,4 @@ public class RegionNameAndIngressRules extends RegionAndName {
       return authorizeSelf;
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreatePlacementGroupIfNeeded.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.functions;
+package org.jclouds.ec2.compute.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
@@ -28,11 +28,11 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 
 import org.jclouds.aws.AWSResponseException;
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
-import org.jclouds.aws.ec2.domain.PlacementGroup;
-import org.jclouds.aws.ec2.domain.PlacementGroup.State;
 import org.jclouds.compute.reference.ComputeServiceConstants;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.domain.PlacementGroup;
+import org.jclouds.ec2.domain.PlacementGroup.State;
 import org.jclouds.logging.Logger;
 
 import com.google.common.base.Function;

apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreateSecurityGroupIfNeeded.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.functions;
+package org.jclouds.ec2.compute.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -26,10 +26,10 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.compute.domain.RegionNameAndIngressRules;
-import org.jclouds.aws.ec2.domain.IpProtocol;
-import org.jclouds.aws.ec2.domain.UserIdGroupPair;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.compute.domain.RegionNameAndIngressRules;
+import org.jclouds.ec2.domain.IpProtocol;
+import org.jclouds.ec2.domain.UserIdGroupPair;
 import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.logging.Logger;
 

apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPair.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.functions;
+package org.jclouds.ec2.compute.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -26,9 +26,9 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
-import org.jclouds.aws.ec2.domain.KeyPair;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.domain.KeyPair;
 import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.logging.Logger;
 

apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CredentialsForInstance.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.functions;
+package org.jclouds.ec2.compute.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -26,9 +26,9 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
-import org.jclouds.aws.ec2.domain.KeyPair;
-import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.domain.KeyPair;
+import org.jclouds.ec2.domain.RunningInstance;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy;
 import org.jclouds.domain.Credentials;
@@ -76,4 +76,4 @@ public class CredentialsForInstance implements Function<RunningInstance, Credent
             credentialProvider.execute(imageForInstance.get(new RegionAndName(from.getRegion(), from.getImageId()))),
             "login from image: " + from.getImageId()).identity;
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/ImageParser.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.functions;
+package org.jclouds.ec2.compute.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.jclouds.compute.util.ComputeServiceUtils.parseOsFamilyOrNull;
@@ -33,8 +33,8 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.domain.Image.Architecture;
-import org.jclouds.aws.ec2.domain.Image.ImageType;
+import org.jclouds.ec2.domain.Image.Architecture;
+import org.jclouds.ec2.domain.Image.ImageType;
 import org.jclouds.collect.Memoized;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.ImageBuilder;
@@ -59,7 +59,7 @@ import com.google.common.collect.Iterables;
  * @author Adrian Cole
  */
 @Singleton
-public class ImageParser implements Function<org.jclouds.aws.ec2.domain.Image, Image> {
+public class ImageParser implements Function<org.jclouds.ec2.domain.Image, Image> {
    @Resource
    @Named(ComputeServiceConstants.COMPUTE_LOGGER)
    protected Logger logger = Logger.NULL;
@@ -105,7 +105,7 @@ public class ImageParser implements Function<org.jclouds.aws.ec2.domain.Image, I
    }
 
    @Override
-   public Image apply(final org.jclouds.aws.ec2.domain.Image from) {
+   public Image apply(final org.jclouds.ec2.domain.Image from) {
       if (from.getImageType() != ImageType.MACHINE) {
          logger.trace("skipping as not a machine image(%s)", from.getId());
          return null;
@@ -177,4 +177,4 @@ public class ImageParser implements Function<org.jclouds.aws.ec2.domain.Image, I
       }
       throw new NoSuchElementException(manifest);
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RegionAndIdToImage.java

@@ -17,9 +17,9 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.functions;
+package org.jclouds.ec2.compute.functions;
 
-import static org.jclouds.aws.ec2.options.DescribeImagesOptions.Builder.imageIds;
+import static org.jclouds.ec2.options.DescribeImagesOptions.Builder.imageIds;
 
 import java.util.NoSuchElementException;
 
@@ -27,8 +27,8 @@ import javax.annotation.Resource;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.compute.domain.RegionAndName;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.logging.Logger;
 import org.jclouds.rest.ResourceNotFoundException;
@@ -56,7 +56,7 @@ public final class RegionAndIdToImage implements Function<RegionAndName, Image>
 
    public Image apply(RegionAndName key) {
       try {
-         org.jclouds.aws.ec2.domain.Image image = Iterables.getOnlyElement(sync.getAMIServices()
+         org.jclouds.ec2.domain.Image image = Iterables.getOnlyElement(sync.getAMIServices()
                .describeImagesInRegion(key.getRegion(), imageIds(key.getName())));
          return parser.apply(image);
       } catch (NoSuchElementException e) {
@@ -74,4 +74,4 @@ public final class RegionAndIdToImage implements Function<RegionAndName, Image>
    public static String message(RegionAndName key, Exception e) {
       return String.format("could not find image %s/%s: %s", key.getRegion(), key.getName(), e.getMessage());
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.functions;
+package org.jclouds.ec2.compute.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -31,11 +31,11 @@ import javax.annotation.Resource;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
-import org.jclouds.aws.ec2.domain.InstanceState;
-import org.jclouds.aws.ec2.domain.RootDeviceType;
-import org.jclouds.aws.ec2.domain.RunningInstance;
-import org.jclouds.aws.ec2.domain.RunningInstance.EbsBlockDevice;
+import org.jclouds.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.domain.InstanceState;
+import org.jclouds.ec2.domain.RootDeviceType;
+import org.jclouds.ec2.domain.RunningInstance;
+import org.jclouds.ec2.domain.RunningInstance.EbsBlockDevice;
 import org.jclouds.collect.Memoized;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.HardwareBuilder;

apis/ec2/src/main/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImpl.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.internal;
+package org.jclouds.ec2.compute.internal;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -29,8 +29,8 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;
 
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
-import org.jclouds.aws.ec2.compute.options.EC2TemplateOptions;
+import org.jclouds.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.compute.options.EC2TemplateOptions;
 import org.jclouds.collect.Memoized;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;

apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.options;
+package org.jclouds.ec2.compute.options;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -43,7 +43,7 @@ import com.google.common.collect.Iterables;
  * needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.compute.options.EC2TemplateOptions.Builder.*;
+ * import static org.jclouds.ec2.compute.options.EC2TemplateOptions.Builder.*;
  * <p/>
  * ComputeService client = // get connection
  * templateBuilder.options(inboundPorts(22, 80, 8080, 443));

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java

@@ -17,9 +17,9 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.strategy;
+package org.jclouds.ec2.compute.strategy;
 
-import static org.jclouds.aws.ec2.options.RunInstancesOptions.Builder.asType;
+import static org.jclouds.ec2.options.RunInstancesOptions.Builder.asType;
 
 import java.util.Map;
 import java.util.Set;
@@ -29,14 +29,14 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
-import org.jclouds.aws.ec2.compute.domain.RegionNameAndIngressRules;
-import org.jclouds.aws.ec2.compute.functions.CreatePlacementGroupIfNeeded;
-import org.jclouds.aws.ec2.compute.functions.CreateSecurityGroupIfNeeded;
-import org.jclouds.aws.ec2.compute.functions.CreateUniqueKeyPair;
-import org.jclouds.aws.ec2.compute.options.EC2TemplateOptions;
-import org.jclouds.aws.ec2.domain.KeyPair;
-import org.jclouds.aws.ec2.options.RunInstancesOptions;
+import org.jclouds.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.compute.domain.RegionNameAndIngressRules;
+import org.jclouds.ec2.compute.functions.CreatePlacementGroupIfNeeded;
+import org.jclouds.ec2.compute.functions.CreateSecurityGroupIfNeeded;
+import org.jclouds.ec2.compute.functions.CreateUniqueKeyPair;
+import org.jclouds.ec2.compute.options.EC2TemplateOptions;
+import org.jclouds.ec2.domain.KeyPair;
+import org.jclouds.ec2.options.RunInstancesOptions;
 import org.jclouds.compute.domain.Template;
 import org.jclouds.compute.options.TemplateOptions;
 import org.jclouds.location.Provider;
@@ -189,4 +189,4 @@ public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions
       }
       return groups;
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/DescribeImagesParallel.java

@@ -17,13 +17,13 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.strategy;
+package org.jclouds.ec2.compute.strategy;
 
 import static com.google.common.collect.Iterables.concat;
 import static org.jclouds.concurrent.FutureIterables.transformParallel;
 
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
@@ -33,9 +33,9 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 
 import org.jclouds.Constants;
-import org.jclouds.aws.ec2.EC2AsyncClient;
-import org.jclouds.aws.ec2.options.DescribeImagesOptions;
 import org.jclouds.compute.reference.ComputeServiceConstants;
+import org.jclouds.ec2.EC2AsyncClient;
+import org.jclouds.ec2.options.DescribeImagesOptions;
 import org.jclouds.logging.Logger;
 
 import com.google.common.base.Function;
@@ -46,35 +46,35 @@ import com.google.common.base.Function;
  */
 @Singleton
 public class DescribeImagesParallel implements
-         Function<Iterable<Entry<String, DescribeImagesOptions>>, Iterable<? extends org.jclouds.aws.ec2.domain.Image>> {
+         Function<Iterable<Entry<String, DescribeImagesOptions>>, Iterable<? extends org.jclouds.ec2.domain.Image>> {
    @Resource
    @Named(ComputeServiceConstants.COMPUTE_LOGGER)
    protected Logger logger = Logger.NULL;
 
-   protected final EC2AsyncClient sync;
+   protected final EC2AsyncClient async;
    final ExecutorService executor;
 
    @Inject
-   public DescribeImagesParallel(EC2AsyncClient sync, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
+   public DescribeImagesParallel(EC2AsyncClient async, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
       super();
-      this.sync = sync;
+      this.async = async;
       this.executor = executor;
    }
 
    @Override
-   public Iterable<? extends org.jclouds.aws.ec2.domain.Image> apply(
+   public Iterable<? extends org.jclouds.ec2.domain.Image> apply(
             Iterable<Entry<String, DescribeImagesOptions>> queries) {
       return concat(transformParallel(
                queries,
-               new Function<Entry<String, DescribeImagesOptions>, Future<Set<? extends org.jclouds.aws.ec2.domain.Image>>>() {
+               new Function<Entry<String, DescribeImagesOptions>, Future<Set<? extends org.jclouds.ec2.domain.Image>>>() {
 
                   @Override
-                  public Future<Set<? extends org.jclouds.aws.ec2.domain.Image>> apply(
+                  public Future<Set<? extends org.jclouds.ec2.domain.Image>> apply(
                            Entry<String, DescribeImagesOptions> from) {
-                     return sync.getAMIServices().describeImagesInRegion(from.getKey(), from.getValue());
+                     return async.getAMIServices().describeImagesInRegion(from.getKey(), from.getValue());
                   }
 
                }, executor, null, logger, "amis"));
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategy.java

@@ -17,20 +17,19 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.strategy;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.parseHandle;
+package org.jclouds.ec2.compute.strategy;
 
 import javax.annotation.Resource;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.compute.strategy.DestroyNodeStrategy;
 import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
+import org.jclouds.ec2.EC2Client;
 import org.jclouds.logging.Logger;
 
 /**
@@ -54,11 +53,11 @@ public class EC2DestroyNodeStrategy implements DestroyNodeStrategy {
 
    @Override
    public NodeMetadata destroyNode(String id) {
-      String[] parts = parseHandle(id);
+      String[] parts = AWSUtils.parseHandle(id);
       String region = parts[0];
       String instanceId = parts[1];
       ec2Client.getInstanceServices().terminateInstancesInRegion(region,
             instanceId);
       return getNode.getNode(id);
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2GetNodeMetadataStrategy.java

@@ -17,21 +17,21 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.strategy;
+package org.jclouds.ec2.compute.strategy;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static org.jclouds.aws.ec2.util.EC2Utils.getAllRunningInstancesInRegion;
-import static org.jclouds.aws.ec2.util.EC2Utils.parseHandle;
+import static org.jclouds.ec2.util.EC2Utils.getAllRunningInstancesInRegion;
 
 import java.util.NoSuchElementException;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.domain.RunningInstance;
 
 import com.google.common.base.Function;
 
@@ -54,7 +54,7 @@ public class EC2GetNodeMetadataStrategy implements GetNodeMetadataStrategy {
 
    @Override
    public NodeMetadata getNode(String id) {
-      String[] parts = parseHandle(id);
+      String[] parts = AWSUtils.parseHandle(id);
       String region = parts[0];
       String instanceId = parts[1];
       try {
@@ -66,4 +66,4 @@ public class EC2GetNodeMetadataStrategy implements GetNodeMetadataStrategy {
       }
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.strategy;
+package org.jclouds.ec2.compute.strategy;
 
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Iterables.filter;
@@ -35,9 +35,9 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 
 import org.jclouds.Constants;
-import org.jclouds.aws.ec2.EC2AsyncClient;
-import org.jclouds.aws.ec2.domain.Reservation;
-import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.ec2.EC2AsyncClient;
+import org.jclouds.ec2.domain.Reservation;
+import org.jclouds.ec2.domain.RunningInstance;
 import org.jclouds.compute.domain.ComputeMetadata;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.predicates.NodePredicates;
@@ -95,4 +95,4 @@ public class EC2ListNodesStrategy implements ListNodesStrategy {
       Iterable<? extends NodeMetadata> nodes = filter(transform(instances, runningInstanceToNodeMetadata), filter);
       return newLinkedHashSet(nodes);
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2PopulateDefaultLoginCredentialsForImageStrategy.java

@@ -17,13 +17,13 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.strategy;
+package org.jclouds.ec2.compute.strategy;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.domain.Image;
+import org.jclouds.ec2.domain.Image;
 import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy;
 import org.jclouds.domain.Credentials;
 
@@ -48,7 +48,7 @@ public class EC2PopulateDefaultLoginCredentialsForImageStrategy implements
          // canonical/alestic images use the ubuntu user to login
          if (owner.matches("063491364108|099720109477")) {
             credentials = new Credentials("ubuntu", null);
-            // http://aws.typepad.com/aws/2010/09/introducing-amazon-linux-ami.html
+            // http://typepad.com/2010/09/introducing-amazon-linux-ami.html
          } else if (owner.equals("137112412989")) {
             credentials = new Credentials("ec2-user", null);
          }

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2RebootNodeStrategy.java

@@ -17,18 +17,17 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.strategy;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.parseHandle;
+package org.jclouds.ec2.compute.strategy;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.services.InstanceClient;
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
 import org.jclouds.compute.strategy.RebootNodeStrategy;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.services.InstanceClient;
 
 /**
  * 
@@ -47,11 +46,11 @@ public class EC2RebootNodeStrategy implements RebootNodeStrategy {
 
    @Override
    public NodeMetadata rebootNode(String id) {
-      String[] parts = parseHandle(id);
+      String[] parts = AWSUtils.parseHandle(id);
       String region = parts[0];
       String instanceId = parts[1];
       client.rebootInstancesInRegion(region, instanceId);
       return getNode.getNode(id);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ResumeNodeStrategy.java

@@ -17,18 +17,17 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.strategy;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.parseHandle;
+package org.jclouds.ec2.compute.strategy;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.services.InstanceClient;
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
 import org.jclouds.compute.strategy.ResumeNodeStrategy;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.services.InstanceClient;
 
 /**
  * 
@@ -47,11 +46,11 @@ public class EC2ResumeNodeStrategy implements ResumeNodeStrategy {
 
    @Override
    public NodeMetadata resumeNode(String id) {
-      String[] parts = parseHandle(id);
+      String[] parts = AWSUtils.parseHandle(id);
       String region = parts[0];
       String instanceId = parts[1];
       client.startInstancesInRegion(region, instanceId);
       return getNode.getNode(id);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2RunNodesAndAddToSetStrategy.java

@@ -17,13 +17,12 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.strategy;
+package org.jclouds.ec2.compute.strategy;
 
 import static com.google.common.collect.Iterables.all;
 import static com.google.common.collect.Iterables.transform;
-import static org.jclouds.aws.ec2.compute.util.EC2ComputeUtils.getRegionFromLocationOrNull;
-import static org.jclouds.aws.ec2.compute.util.EC2ComputeUtils.getZoneFromLocationOrNull;
-import static org.jclouds.aws.ec2.compute.util.EC2ComputeUtils.instanceToId;
+import static org.jclouds.ec2.compute.util.EC2ComputeUtils.getZoneFromLocationOrNull;
+import static org.jclouds.ec2.compute.util.EC2ComputeUtils.instanceToId;
 
 import java.util.Map;
 import java.util.Set;
@@ -34,17 +33,18 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.compute.options.EC2TemplateOptions;
-import org.jclouds.aws.ec2.domain.Reservation;
-import org.jclouds.aws.ec2.domain.RunningInstance;
-import org.jclouds.aws.ec2.options.RunInstancesOptions;
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.Template;
 import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.compute.strategy.RunNodesAndAddToSetStrategy;
 import org.jclouds.compute.util.ComputeUtils;
 import org.jclouds.domain.Credentials;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.compute.options.EC2TemplateOptions;
+import org.jclouds.ec2.domain.Reservation;
+import org.jclouds.ec2.domain.RunningInstance;
+import org.jclouds.ec2.options.RunInstancesOptions;
 import org.jclouds.logging.Logger;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -126,7 +126,7 @@ public class EC2RunNodesAndAddToSetStrategy implements RunNodesAndAddToSetStrate
    @VisibleForTesting
    Reservation<? extends RunningInstance> createKeyPairAndSecurityGroupsAsNeededThenRunInstances(String tag, int count,
             Template template) {
-      String region = getRegionFromLocationOrNull(template.getLocation());
+      String region = AWSUtils.getRegionFromLocationOrNull(template.getLocation());
       String zone = getZoneFromLocationOrNull(template.getLocation());
 
       RunInstancesOptions instanceOptions = createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.execute(region,
@@ -143,4 +143,4 @@ public class EC2RunNodesAndAddToSetStrategy implements RunNodesAndAddToSetStrate
                count, instanceOptions);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2SuspendNodeStrategy.java

@@ -17,18 +17,17 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.strategy;
-
-import static org.jclouds.aws.ec2.util.EC2Utils.parseHandle;
+package org.jclouds.ec2.compute.strategy;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.services.InstanceClient;
+import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
 import org.jclouds.compute.strategy.SuspendNodeStrategy;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.services.InstanceClient;
 
 /**
  * 
@@ -47,11 +46,11 @@ public class EC2SuspendNodeStrategy implements SuspendNodeStrategy {
 
    @Override
    public NodeMetadata suspendNode(String id) {
-      String[] parts = parseHandle(id);
+      String[] parts = AWSUtils.parseHandle(id);
       String region = parts[0];
       String instanceId = parts[1];
       client.stopInstancesInRegion(region, true, instanceId);
       return getNode.getNode(id);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2HardwareSupplier.java

@@ -17,21 +17,21 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.suppliers;
+package org.jclouds.ec2.compute.suppliers;
 
 import static com.google.common.collect.Iterables.find;
 import static com.google.common.collect.Sets.newLinkedHashSet;
-import static org.jclouds.aws.ec2.compute.domain.EC2HardwareBuilder.c1_medium;
-import static org.jclouds.aws.ec2.compute.domain.EC2HardwareBuilder.c1_xlarge;
-import static org.jclouds.aws.ec2.compute.domain.EC2HardwareBuilder.cc1_4xlarge;
-import static org.jclouds.aws.ec2.compute.domain.EC2HardwareBuilder.m1_large;
-import static org.jclouds.aws.ec2.compute.domain.EC2HardwareBuilder.m1_small;
-import static org.jclouds.aws.ec2.compute.domain.EC2HardwareBuilder.m1_xlarge;
-import static org.jclouds.aws.ec2.compute.domain.EC2HardwareBuilder.m2_2xlarge;
-import static org.jclouds.aws.ec2.compute.domain.EC2HardwareBuilder.m2_4xlarge;
-import static org.jclouds.aws.ec2.compute.domain.EC2HardwareBuilder.m2_xlarge;
-import static org.jclouds.aws.ec2.compute.domain.EC2HardwareBuilder.t1_micro;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c1_medium;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c1_xlarge;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.cc1_4xlarge;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_large;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_small;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_xlarge;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m2_2xlarge;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m2_4xlarge;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m2_xlarge;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.t1_micro;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
 import static org.jclouds.compute.predicates.ImagePredicates.any;
 
 import java.util.Set;
@@ -94,4 +94,4 @@ public class EC2HardwareSupplier implements Supplier<Set<? extends Hardware>> {
                m1_xlarge().build(), m2_xlarge().build(), m2_2xlarge().build(), m2_4xlarge().build()));
       return sizes;
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.suppliers;
+package org.jclouds.ec2.compute.suppliers;
 
 import java.util.Map;
 import java.util.Set;
@@ -25,7 +25,7 @@ import java.util.Set;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.compute.domain.RegionAndName;
 import org.jclouds.compute.domain.Image;
 
 import com.google.common.base.Supplier;
@@ -49,4 +49,4 @@ public class EC2ImageSupplier implements Supplier<Set<? extends Image>> {
       return Sets.newLinkedHashSet(map.get().values());
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/RegionAndNameToImageSupplier.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.suppliers;
+package org.jclouds.ec2.compute.suppliers;
 
 /**
  *
@@ -43,10 +43,10 @@ import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Iterables.transform;
 import static com.google.common.collect.Maps.newLinkedHashMap;
 import static com.google.common.collect.Maps.uniqueIndex;
-import static org.jclouds.aws.ec2.options.DescribeImagesOptions.Builder.imageIds;
-import static org.jclouds.aws.ec2.options.DescribeImagesOptions.Builder.ownedBy;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
-import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
+import static org.jclouds.ec2.options.DescribeImagesOptions.Builder.imageIds;
+import static org.jclouds.ec2.options.DescribeImagesOptions.Builder.ownedBy;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
+import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -57,10 +57,10 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.compute.domain.RegionAndName;
-import org.jclouds.aws.ec2.compute.functions.ImageParser;
-import org.jclouds.aws.ec2.compute.strategy.DescribeImagesParallel;
-import org.jclouds.aws.ec2.options.DescribeImagesOptions;
+import org.jclouds.ec2.compute.domain.RegionAndName;
+import org.jclouds.ec2.compute.functions.ImageParser;
+import org.jclouds.ec2.compute.strategy.DescribeImagesParallel;
+import org.jclouds.ec2.options.DescribeImagesOptions;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.location.Region;
@@ -154,4 +154,4 @@ public class RegionAndNameToImageSupplier implements Supplier<Map<RegionAndName,
          options = ownedBy(amiOwners);
       return options;
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/compute/util/EC2ComputeUtils.java

@@ -17,11 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.compute.util;
+package org.jclouds.ec2.compute.util;
 
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.ec2.domain.RunningInstance;
 import org.jclouds.domain.Location;
 import org.jclouds.domain.LocationScope;
 
@@ -41,13 +41,8 @@ public class EC2ComputeUtils {
       }
    };
 
-   public static String getRegionFromLocationOrNull(Location location) {
-      return location.getScope() == LocationScope.ZONE ? location.getParent().getId() : location
-               .getId();
-   }
-
    public static String getZoneFromLocationOrNull(Location location) {
       return location.getScope() == LocationScope.ZONE ? location.getId() : null;
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/config/EC2RestClientModule.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.config;
+package org.jclouds.ec2.config;
 
 import java.net.URI;
 import java.util.Map;
@@ -27,29 +27,29 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.jclouds.aws.config.WithZonesFormSigningRestClientModule;
-import org.jclouds.aws.ec2.EC2AsyncClient;
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.domain.AvailabilityZoneInfo;
-import org.jclouds.aws.ec2.services.AMIAsyncClient;
-import org.jclouds.aws.ec2.services.AMIClient;
-import org.jclouds.aws.ec2.services.AvailabilityZoneAndRegionAsyncClient;
-import org.jclouds.aws.ec2.services.AvailabilityZoneAndRegionClient;
-import org.jclouds.aws.ec2.services.ElasticBlockStoreAsyncClient;
-import org.jclouds.aws.ec2.services.ElasticBlockStoreClient;
-import org.jclouds.aws.ec2.services.ElasticIPAddressAsyncClient;
-import org.jclouds.aws.ec2.services.ElasticIPAddressClient;
-import org.jclouds.aws.ec2.services.InstanceAsyncClient;
-import org.jclouds.aws.ec2.services.InstanceClient;
-import org.jclouds.aws.ec2.services.KeyPairAsyncClient;
-import org.jclouds.aws.ec2.services.KeyPairClient;
-import org.jclouds.aws.ec2.services.MonitoringAsyncClient;
-import org.jclouds.aws.ec2.services.MonitoringClient;
-import org.jclouds.aws.ec2.services.PlacementGroupAsyncClient;
-import org.jclouds.aws.ec2.services.PlacementGroupClient;
-import org.jclouds.aws.ec2.services.SecurityGroupAsyncClient;
-import org.jclouds.aws.ec2.services.SecurityGroupClient;
-import org.jclouds.aws.ec2.services.WindowsAsyncClient;
-import org.jclouds.aws.ec2.services.WindowsClient;
+import org.jclouds.ec2.EC2AsyncClient;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.domain.AvailabilityZoneInfo;
+import org.jclouds.ec2.services.AMIAsyncClient;
+import org.jclouds.ec2.services.AMIClient;
+import org.jclouds.ec2.services.AvailabilityZoneAndRegionAsyncClient;
+import org.jclouds.ec2.services.AvailabilityZoneAndRegionClient;
+import org.jclouds.ec2.services.ElasticBlockStoreAsyncClient;
+import org.jclouds.ec2.services.ElasticBlockStoreClient;
+import org.jclouds.ec2.services.ElasticIPAddressAsyncClient;
+import org.jclouds.ec2.services.ElasticIPAddressClient;
+import org.jclouds.ec2.services.InstanceAsyncClient;
+import org.jclouds.ec2.services.InstanceClient;
+import org.jclouds.ec2.services.KeyPairAsyncClient;
+import org.jclouds.ec2.services.KeyPairClient;
+import org.jclouds.ec2.services.MonitoringAsyncClient;
+import org.jclouds.ec2.services.MonitoringClient;
+import org.jclouds.ec2.services.PlacementGroupAsyncClient;
+import org.jclouds.ec2.services.PlacementGroupClient;
+import org.jclouds.ec2.services.SecurityGroupAsyncClient;
+import org.jclouds.ec2.services.SecurityGroupClient;
+import org.jclouds.ec2.services.WindowsAsyncClient;
+import org.jclouds.ec2.services.WindowsClient;
 import org.jclouds.http.RequiresHttp;
 import org.jclouds.location.Region;
 import org.jclouds.location.Zone;
@@ -137,4 +137,4 @@ public class EC2RestClientModule extends WithZonesFormSigningRestClientModule<EC
 
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/Attachment.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

apis/ec2/src/main/java/org/jclouds/ec2/domain/AvailabilityZone.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import java.util.Set;
 
@@ -46,4 +46,4 @@ public class AvailabilityZone {
            US_EAST_1A, US_EAST_1B, US_EAST_1C, US_EAST_1D,
            US_WEST_1A, US_WEST_1B, AP_SOUTHEAST_1A, AP_SOUTHEAST_1B);
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/AvailabilityZoneInfo.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -129,4 +129,4 @@ public class AvailabilityZoneInfo implements Comparable<AvailabilityZoneInfo>{
       return zone.compareTo(that.zone);
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -29,7 +29,7 @@ import com.google.common.collect.Multimap;
 
 /**
  * Defines the mapping of volumes for
- * {@link org.jclouds.aws.ec2.services.InstanceClient#setBlockDeviceMappingForInstanceInRegion}.
+ * {@link org.jclouds.ec2.services.InstanceClient#setBlockDeviceMappingForInstanceInRegion}.
  * 
  * @author Oleksiy Yarmula
  */

apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleInstanceS3Storage.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -30,16 +30,16 @@ import javax.annotation.Nullable;
  * @author Adrian Cole
  */
 public class BundleInstanceS3Storage {
-   private final String awsAccessKeyId;
+   private final String ccessKeyId;
    private final String bucket;
    private final String prefix;
    private final String secretAccessKey;
    private final String uploadPolicy;
    private final String uploadPolicySignature;
 
-   public BundleInstanceS3Storage(@Nullable String awsAccessKeyId, String bucket, String prefix,
+   public BundleInstanceS3Storage(@Nullable String ccessKeyId, String bucket, String prefix,
          @Nullable String secretAccessKey, @Nullable String uploadPolicy, @Nullable String uploadPolicySignature) {
-      this.awsAccessKeyId = awsAccessKeyId;
+      this.ccessKeyId = ccessKeyId;
       this.bucket = checkNotNull(bucket, "bucket");
       this.prefix = checkNotNull(prefix, "prefix");
       this.secretAccessKey = secretAccessKey;
@@ -51,7 +51,7 @@ public class BundleInstanceS3Storage {
    public int hashCode() {
       final int prime = 31;
       int result = 1;
-      result = prime * result + ((awsAccessKeyId == null) ? 0 : awsAccessKeyId.hashCode());
+      result = prime * result + ((ccessKeyId == null) ? 0 : ccessKeyId.hashCode());
       result = prime * result + ((bucket == null) ? 0 : bucket.hashCode());
       result = prime * result + ((prefix == null) ? 0 : prefix.hashCode());
       result = prime * result + ((secretAccessKey == null) ? 0 : secretAccessKey.hashCode());
@@ -69,10 +69,10 @@ public class BundleInstanceS3Storage {
       if (getClass() != obj.getClass())
          return false;
       BundleInstanceS3Storage other = (BundleInstanceS3Storage) obj;
-      if (awsAccessKeyId == null) {
-         if (other.awsAccessKeyId != null)
+      if (ccessKeyId == null) {
+         if (other.ccessKeyId != null)
             return false;
-      } else if (!awsAccessKeyId.equals(other.awsAccessKeyId))
+      } else if (!ccessKeyId.equals(other.ccessKeyId))
          return false;
       if (bucket == null) {
          if (other.bucket != null)
@@ -104,7 +104,7 @@ public class BundleInstanceS3Storage {
 
    @Override
    public String toString() {
-      return "[awsAccessKeyId=" + awsAccessKeyId + ", bucket=" + bucket + ", prefix=" + prefix + ", secreAccessKey="
+      return "[ccessKeyId=" + ccessKeyId + ", bucket=" + bucket + ", prefix=" + prefix + ", secreAccessKey="
             + secretAccessKey + ", uploadPolicy=" + uploadPolicy + ", uploadPolicySignature=" + uploadPolicySignature
             + "]";
    }

apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -467,4 +467,4 @@ public class Image implements Comparable<Image> {
                + "]";
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/ImageAttribute.java

@@ -17,9 +17,9 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
-import org.jclouds.aws.ec2.EC2AsyncClient;
+import org.jclouds.ec2.EC2AsyncClient;
 
 /**
  * 
@@ -100,4 +100,4 @@ public enum ImageAttribute {
          return UNRECOGNIZED;
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceState.java

@@ -17,11 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.jclouds.aws.ec2.EC2AsyncClient;
+import org.jclouds.ec2.EC2AsyncClient;
 
 import com.google.common.base.CaseFormat;
 
@@ -99,4 +99,4 @@ public enum InstanceState {
             return UNRECOGNIZED;
       }
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceStateChange.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -115,4 +115,4 @@ public class InstanceStateChange implements Comparable<InstanceStateChange> {
                + ", previousState=" + previousState + ", region=" + region + "]";
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java

@@ -17,9 +17,9 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
-import org.jclouds.aws.ec2.EC2AsyncClient;
+import org.jclouds.ec2.EC2AsyncClient;
 
 /**
  * 
@@ -149,4 +149,4 @@ public class InstanceType {
     */
    public static final String CC1_4XLARGE = "cc1.4xlarge";
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/IpPermission.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import java.util.Set;
 
@@ -136,4 +136,4 @@ public class IpPermission implements Comparable<IpPermission> {
                + ipProtocol + ", ipRanges=" + ipRanges + ", toPort=" + toPort + "]";
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/IpProtocol.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -46,4 +46,4 @@ public enum IpProtocol {
       }
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -122,4 +122,4 @@ public class KeyPair implements Comparable<KeyPair> {
       return true;
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/MonitoringState.java

@@ -17,12 +17,12 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.jclouds.aws.ec2.services.InstanceClient;
-import org.jclouds.aws.ec2.services.MonitoringClient;
+import org.jclouds.ec2.services.InstanceClient;
+import org.jclouds.ec2.services.MonitoringClient;
 
 /**
  * 
@@ -60,4 +60,4 @@ public enum MonitoringState {
          return UNRECOGNIZED;
       }
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/Permission.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -93,4 +93,4 @@ public class Permission {
       return "LaunchPermission [groups=" + groups + ", userIds=" + userIds + "]";
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/PlacementGroup.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -107,4 +107,4 @@ public class PublicIpInstanceIdPair implements Comparable<PublicIpInstanceIdPair
       return true;
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -147,4 +147,4 @@ public class Reservation<T extends RunningInstance> extends LinkedHashSet<T> imp
       return true;
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/ReservedInstancesOffering.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 /**
  * 

apis/ec2/src/main/java/org/jclouds/ec2/domain/RootDeviceType.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import com.google.common.base.CaseFormat;
 
@@ -48,4 +48,4 @@ public enum RootDeviceType {
          return UNRECOGNIZED;
       }
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -27,7 +27,7 @@ import java.util.Set;
 
 import javax.annotation.Nullable;
 
-import org.jclouds.aws.ec2.domain.Attachment.Status;
+import org.jclouds.ec2.domain.Attachment.Status;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
@@ -595,4 +595,4 @@ public class RunningInstance implements Comparable<RunningInstance> {
                + spotInstanceRequestId + ", subnetId=" + subnetId + ", vpcId=" + vpcId + "]";
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -144,4 +144,4 @@ public class SecurityGroup implements Comparable<SecurityGroup> {
       return "SecurityGroup [description=" + description + ", ipPermissions=" + ipPermissions
                + ", name=" + name + ", ownerId=" + ownerId + ", region=" + region + "]";
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/Snapshot.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -94,4 +94,4 @@ public class UserIdGroupPair implements Comparable<UserIdGroupPair> {
       return true;
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.domain;
+package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -218,4 +218,4 @@ public class Volume implements Comparable<Volume> {
                + createTime + ", id=" + id + ", region=" + region + ", size=" + size + ", snapshotId=" + snapshotId
                + ", status=" + status + "]";
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/functions/ConvertUnencodedBytesToBase64EncodedString.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.functions;
+package org.jclouds.ec2.functions;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -45,4 +45,4 @@ public class ConvertUnencodedBytesToBase64EncodedString implements Function<Obje
                "userData cannot be larger than 16kb");
       return CryptoStreams.base64(unencodedData);
    }
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/functions/ReturnVoidOnVolumeAvailable.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.functions;
+package org.jclouds.ec2.functions;
 
 import static org.jclouds.util.Throwables2.propagateOrNull;
 
@@ -40,4 +40,4 @@ public class ReturnVoidOnVolumeAvailable implements Function<Exception, Void> {
       return Void.class.cast(propagateOrNull(from));
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/options/BundleInstanceS3StorageOptions.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
@@ -25,7 +25,7 @@ import static org.jclouds.Constants.PROPERTY_IDENTITY;
 
 import javax.inject.Named;
 
-import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
+import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
 
 import com.google.common.collect.Multimap;
 import com.google.inject.Inject;
@@ -39,7 +39,7 @@ import com.google.inject.Inject;
  * followed by an instance mutator (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.BundleInstanceS3StorageOptions.Builder.*
+ * import static org.jclouds.ec2.options.BundleInstanceS3StorageOptions.Builder.*
  * <p/>
  * EC2Client connection = // get connection
  * String imageId = connection.getWindowsServices().bundleInstanceInRegion(...bucketOwnedBy(anotherAccessKey));
@@ -67,11 +67,11 @@ public class BundleInstanceS3StorageOptions extends BaseEC2RequestOptions {
 
    /**
     * 
-    * @param awsAccessKeyId
+    * @param ccessKeyId
     *           The Access Key ID of the owner of the Amazon S3 bucket.
     */
-   public BundleInstanceS3StorageOptions bucketOwnedBy(String awsAccessKeyId) {
-      formParameters.put("Storage.S3.AWSAccessKeyId", checkNotNull(awsAccessKeyId, "awsAccessKeyId"));
+   public BundleInstanceS3StorageOptions bucketOwnedBy(String ccessKeyId) {
+      formParameters.put("Storage.S3.AWSAccessKeyId", checkNotNull(ccessKeyId, "ccessKeyId"));
       return this;
    }
 
@@ -85,11 +85,11 @@ public class BundleInstanceS3StorageOptions extends BaseEC2RequestOptions {
 
    public static class Builder {
       /**
-       * @see BundleInstanceS3StorageOptions#bucketOwnedBy(awsAccessKeyId)
+       * @see BundleInstanceS3StorageOptions#bucketOwnedBy(ccessKeyId)
        */
-      public static BundleInstanceS3StorageOptions bucketOwnedBy(String awsAccessKeyId) {
+      public static BundleInstanceS3StorageOptions bucketOwnedBy(String ccessKeyId) {
          BundleInstanceS3StorageOptions options = new BundleInstanceS3StorageOptions();
-         return options.bucketOwnedBy(awsAccessKeyId);
+         return options.bucketOwnedBy(ccessKeyId);
       }
 
    }

apis/ec2/src/main/java/org/jclouds/ec2/options/CreateImageOptions.java

@@ -17,11 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
+import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
 
 /**
  * Contains options supported in the Form API for the CreateImage operation. <h2>
@@ -30,7 +30,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
  * (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.CreateImageOptions.Builder.*
+ * import static org.jclouds.ec2.options.CreateImageOptions.Builder.*
  * <p/>
  * EC2Client connection = // get connection
  * Future<Set<ImageMetadata>> images = connection.getAMIServices().createImage(withDescription("123125").noReboot());

apis/ec2/src/main/java/org/jclouds/ec2/options/CreateSnapshotOptions.java

@@ -17,11 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
+import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
 
 /**
  * Contains options supported in the Form API for the CreateSnapshot operation. <h2>
@@ -30,7 +30,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
  * instance mutator (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.CreateSnapshotOptions.Builder.*
+ * import static org.jclouds.ec2.options.CreateSnapshotOptions.Builder.*
  * <p/>
  * EC2Client connection = // get connection
  * Snapshot snapshot = connection.getElasticBlockStoreServices().createSnapshotInRegion(volumeId, withDescription("123125"));

apis/ec2/src/main/java/org/jclouds/ec2/options/DescribeAvailabilityZonesOptions.java

@@ -17,12 +17,12 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import java.util.Arrays;
 import java.util.Set;
 
-import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
+import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
 
 /**
  * Contains options supported in the Form API for the DescribeAvailabilityZones operation. <h2>
@@ -31,7 +31,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
  * followed by an instance mutator (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.DescribeAvailabilityZonesOptions.Builder.*
+ * import static org.jclouds.ec2.options.DescribeAvailabilityZonesOptions.Builder.*
  * <p/>
  * EC2Client connection = // get connection
  * Future<Set<ImageMetadata>> images = connection.getAvailabilityZoneAndRegionServices().describeAvailabilityZones(zones("us-east-1a", "us-east-1b"));

apis/ec2/src/main/java/org/jclouds/ec2/options/DescribeImagesOptions.java

@@ -17,13 +17,13 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Set;
 
-import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
+import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
 
 /**
  * Contains options supported in the Form API for the DescribeImages operation. <h2>
@@ -32,7 +32,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
  * instance mutator (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.DescribeImagesOptions.Builder.*
+ * import static org.jclouds.ec2.options.DescribeImagesOptions.Builder.*
  * <p/>
  * EC2Client connection = // get connection
  * Future<Set<ImageMetadata>> images = connection.getAMIServices().describeImages(executableBy("123125").imageIds(1000, 1004));

apis/ec2/src/main/java/org/jclouds/ec2/options/DescribeRegionsOptions.java

@@ -17,13 +17,13 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import java.util.Arrays;
 import java.util.Set;
 
 import org.jclouds.aws.domain.Region;
-import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
+import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
 
 /**
  * Contains options supported in the Form API for the DescribeRegions operation. <h2>
@@ -32,7 +32,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
  * instance mutator (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.DescribeRegionsOptions.Builder.*
+ * import static org.jclouds.ec2.options.DescribeRegionsOptions.Builder.*
  * <p/>
  * EC2Client connection = // get connection
  * Future<Set<ImageMetadata>> images = connection.getRegionsAndRegionsServices().describeRegions(regions("us-east-1a", "us-east-1b"));

apis/ec2/src/main/java/org/jclouds/ec2/options/DescribeSnapshotsOptions.java

@@ -17,11 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import java.util.Set;
 
-import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
+import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
 
 /**
  * Contains options supported in the Form API for the DescribeSnapshots operation. <h2>
@@ -30,7 +30,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
  * instance mutator (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.DescribeSnapshotsOptions.Builder.*
+ * import static org.jclouds.ec2.options.DescribeSnapshotsOptions.Builder.*
  * <p/>
  * EC2Client connection = // get connection
  * Set<Snapshot> snapshots = connection.getElasticBlockStoreServices().describeSnapshots(restorableBy("123125").snapshotIds(1000, 1004));

apis/ec2/src/main/java/org/jclouds/ec2/options/DetachVolumeOptions.java

@@ -17,11 +17,11 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
+import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
 
 /**
  * Contains options supported in the Form API for the DetachVolume operation. <h2>
@@ -30,7 +30,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
  * mutator (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.DetachVolumeOptions.Builder.*
+ * import static org.jclouds.ec2.options.DetachVolumeOptions.Builder.*
  * <p/>
  * EC2Client client = // get connection
  * client.getElasticBlockStoreServices().detachVolumeInRegion(null, id, fromDevice("123125").force());

apis/ec2/src/main/java/org/jclouds/ec2/options/RegisterImageBackedByEbsOptions.java

@@ -17,14 +17,14 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import javax.annotation.Nullable;
 
-import org.jclouds.aws.ec2.domain.Image.Architecture;
+import org.jclouds.ec2.domain.Image.Architecture;
 
 /**
  * Contains options supported in the Form API for the RegisterImage operation. <h2>
@@ -33,7 +33,7 @@ import org.jclouds.aws.ec2.domain.Image.Architecture;
  * mutator (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.RegisterImageBackedByEbsOptions.Builder.*
+ * import static org.jclouds.ec2.options.RegisterImageBackedByEbsOptions.Builder.*
  * <p/>
  * EC2Client connection = // get connection
  * String imageId = connection.getImageServices().registerImageBackedByEbs(...addEphemeralBlockDeviceFromSnapshot("/dev/sda2","virtual-1","snapshot-id"));

apis/ec2/src/main/java/org/jclouds/ec2/options/RegisterImageOptions.java

@@ -17,12 +17,12 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.jclouds.aws.ec2.domain.Image.Architecture;
-import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
+import org.jclouds.ec2.domain.Image.Architecture;
+import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
 
 /**
  * Contains options supported in the Form API for the RegisterImage operation. <h2>
@@ -31,7 +31,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
  * mutator (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.RegisterImageOptions.Builder.*
+ * import static org.jclouds.ec2.options.RegisterImageOptions.Builder.*
  * <p/>
  * EC2Client connection = // get connection
  * String imageId = connection.getImageServices().registerImageFromManifest(...withArchitecture(Architecture.I386).withDescription("description"));

apis/ec2/src/main/java/org/jclouds/ec2/options/RunInstancesOptions.java

@@ -17,13 +17,13 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options;
+package org.jclouds.ec2.options;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.jclouds.aws.ec2.domain.InstanceType;
-import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
+import org.jclouds.ec2.domain.InstanceType;
+import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
 import org.jclouds.encryption.internal.Base64;
 
 /**
@@ -33,7 +33,7 @@ import org.jclouds.encryption.internal.Base64;
  * mutator (if needed):
  * <p/>
  * <code>
- * import static org.jclouds.aws.ec2.options.RunInstancesOptions.Builder.*
+ * import static org.jclouds.ec2.options.RunInstancesOptions.Builder.*
  * <p/>
  * EC2Client connection = // get connection
  * Future<ReservationInfo> instances = connection.runInstances(executableBy("123125").imageIds(1000, 1004));

apis/ec2/src/main/java/org/jclouds/ec2/options/internal/BaseEC2RequestOptions.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.options.internal;
+package org.jclouds.ec2.options.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -65,4 +65,4 @@ public class BaseEC2RequestOptions extends BaseHttpRequestOptions {
       return values;
    }
 
-}
+}

apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceHasIpAddress.java

@@ -17,14 +17,14 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.predicates;
+package org.jclouds.ec2.predicates;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
 import org.jclouds.aws.AWSResponseException;
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.domain.RunningInstance;
 import org.jclouds.logging.Logger;
 
 import com.google.common.base.Predicate;

apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstancePresent.java

@@ -17,15 +17,15 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.predicates;
+package org.jclouds.ec2.predicates;
 
 import java.util.NoSuchElementException;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.domain.RunningInstance;
 import org.jclouds.logging.Logger;
 import org.jclouds.rest.ResourceNotFoundException;
 

apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateRunning.java

@@ -17,14 +17,14 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.predicates;
+package org.jclouds.ec2.predicates;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.EC2Client;
-import org.jclouds.aws.ec2.domain.InstanceState;
-import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.ec2.EC2Client;
+import org.jclouds.ec2.domain.InstanceState;
+import org.jclouds.ec2.domain.RunningInstance;
 import org.jclouds.logging.Logger;
 import org.jclouds.rest.ResourceNotFoundException;
 

apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateStopped.java

@@ -17,14 +17,14 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.ec2.predicates;
+package org.jclouds.ec2.predicates;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.ec2.domain.InstanceState;
-import org.jclouds.aws.ec2.domain.RunningInstance;
-import org.jclouds.aws.ec2.services.InstanceClient;
+import org.jclouds.ec2.domain.InstanceState;
+import org.jclouds.ec2.domain.RunningInstance;
+import org.jclouds.ec2.services.InstanceClient;
 import org.jclouds.logging.Logger;
 
 import com.google.common.base.Predicate;