cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [09/54] [abbrv] [partial] Reformatted all of the code.
Date Thu, 21 Nov 2013 15:26:56 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
index 20b65a3..555daa0 100644
--- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
+++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
@@ -21,7 +21,6 @@ import java.io.InputStream;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 
-import javax.inject.Inject;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
index b77b415..2dcd391 100644
--- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
+++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
@@ -16,13 +16,12 @@
 // under the License.
 package com.cloud.bridge.auth.ec2;
 
-import org.apache.axis2.modules.Module;
-
-import org.apache.log4j.Logger;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisDescription;
 import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.modules.Module;
+import org.apache.log4j.Logger;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.Policy;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
index 740a4a6..6f43fd1 100644
--- a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
+++ b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
@@ -16,13 +16,12 @@
 // under the License.
 package com.cloud.bridge.auth.s3;
 
-import org.apache.axis2.modules.Module;
-
-import org.apache.log4j.Logger;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisDescription;
 import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.modules.Module;
+import org.apache.log4j.Logger;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.Policy;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java b/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java
index 89066f5..0f40c93 100644
--- a/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java
+++ b/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java
@@ -18,9 +18,10 @@
 
 package com.cloud.bridge.io;
 
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.FilterInputStream;
+
 import org.apache.log4j.Logger;
 
 /**
@@ -362,7 +363,8 @@ public class DimeDelimitedInputStream extends FilterInputStream {
         int typeLength = ((((int)header[6]) << 8) & 0xff00) | ((int)header[7]);
 
         //DATA_LENGTH
-        recordLength = ((((long)header[8]) << 24) & 0xff000000L) | ((((long)header[9]) << 16) & 0xff0000L) | ((((long)header[10]) << 8) & 0xff00L) | ((long)header[11] & 0xffL);
+        recordLength =
+            ((((long)header[8]) << 24) & 0xff000000L) | ((((long)header[9]) << 16) & 0xff0000L) | ((((long)header[10]) << 8) & 0xff00L) | ((long)header[11] & 0xffL);
 
         //OPTIONS + PADDING
         if (0 != optionsLength) {
@@ -419,8 +421,8 @@ public class DimeDelimitedInputStream extends FilterInputStream {
                 throw streamInError;
             }
         }
-        logger.debug("MB:" + MB + ", ME:" + ME + ", CF:" + moreChunks + "Option length:" + optionsLength + ", ID length:" + idLength + ", typeLength:" + typeLength + ", TYPE_T:" +
-                     tnf);
+        logger.debug("MB:" + MB + ", ME:" + ME + ", CF:" + moreChunks + "Option length:" + optionsLength + ", ID length:" + idLength + ", typeLength:" + typeLength +
+            ", TYPE_T:" + tnf);
         logger.debug("id:\"" + id + "\"");
         logger.debug("type:\"" + type + "\"");
         logger.debug("recordlength:\"" + recordLength + "\"");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
index 77249aa..51da536 100644
--- a/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
+++ b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
@@ -24,15 +24,15 @@ import java.io.OutputStream;
 
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
-import javax.xml.stream.XMLOutputFactory;
 
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer;
 import org.apache.axis2.databinding.ADBBean;
 import org.apache.axis2.databinding.ADBException;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer;
 
 /**
  * Provide an MTOM aware serializable output stream writer to be consumed by implementors of the

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
index d4e00d7..1700649 100644
--- a/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
+++ b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
@@ -16,10 +16,10 @@
 // under the License.
 package com.cloud.bridge.io;
 
-import org.apache.log4j.Logger;
-
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.log4j.Logger;
 
 /**
  * A DIME stream is actually composed of multiple encoded streams.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java b/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java
index 74b2c8c..b0dc566 100644
--- a/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java
+++ b/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.bridge.io;
 
-import java.util.Arrays;
-import java.util.HashSet;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -30,12 +28,29 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.HashSet;
 
 import javax.activation.DataHandler;
 import javax.activation.DataSource;
 
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.log4j.Logger;
 
+import com.caringo.client.ResettableFileInputStream;
+import com.caringo.client.ScspClient;
+import com.caringo.client.ScspExecutionException;
+import com.caringo.client.ScspHeaders;
+import com.caringo.client.ScspQueryArgs;
+import com.caringo.client.ScspResponse;
+import com.caringo.client.locate.Locator;
+import com.caringo.client.locate.StaticLocator;
+import com.caringo.client.locate.ZeroconfLocator;
+
 import com.cloud.bridge.service.core.s3.S3BucketAdapter;
 import com.cloud.bridge.service.core.s3.S3MultipartPart;
 import com.cloud.bridge.service.exception.ConfigurationException;
@@ -43,23 +58,8 @@ import com.cloud.bridge.service.exception.FileNotExistException;
 import com.cloud.bridge.service.exception.InternalErrorException;
 import com.cloud.bridge.service.exception.OutOfStorageException;
 import com.cloud.bridge.service.exception.UnsupportedException;
-import com.cloud.bridge.util.StringHelper;
 import com.cloud.bridge.util.OrderedPair;
-
-import com.caringo.client.locate.Locator;
-import com.caringo.client.locate.StaticLocator;
-import com.caringo.client.locate.ZeroconfLocator;
-import com.caringo.client.ResettableFileInputStream;
-import com.caringo.client.ScspClient;
-import com.caringo.client.ScspExecutionException;
-import com.caringo.client.ScspHeaders;
-import com.caringo.client.ScspQueryArgs;
-import com.caringo.client.ScspResponse;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import com.cloud.bridge.util.StringHelper;
 
 /**
  * Creates an SCSP client to a CAStor cluster, configured in "storage.root",
@@ -152,7 +152,7 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter {
         }
         try {
             s_logger.info("CAStor client starting: " + (_domain == null ? "default domain" : "domain " + _domain) + " " +
-                          (clusterName == null ? Arrays.toString(castorNodes) : clusterName) + " :" + castorPort);
+                (clusterName == null ? Arrays.toString(castorNodes) : clusterName) + " :" + castorPort);
             _scspClient = new ScspClient(_locator, castorPort, DEFAULT_MAX_POOL_SIZE, DEFAULT_MAX_RETRIES, CONNECTION_TIMEOUT, CM_IDLE_TIMEOUT);
             _scspClient.start();
         } catch (Exception e) {
@@ -198,7 +198,8 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter {
             ScspResponse bwResponse = myClient(mountedRoot).write(bucket, new ByteArrayInputStream("".getBytes()), 0, domainQueryArg(), new ScspHeaders());
             if (bwResponse.getHttpStatusCode() != HTTP_CREATED) {
                 if (bwResponse.getHttpStatusCode() == HTTP_PRECONDITION_FAILED)
-                    s_logger.error("CAStor unable to create bucket " + bucket + " because domain " + (this._domain == null ? "(default)" : this._domain) + " does not exist");
+                    s_logger.error("CAStor unable to create bucket " + bucket + " because domain " + (this._domain == null ? "(default)" : this._domain) +
+                        " does not exist");
                 else
                     s_logger.error("CAStor unable to create bucket " + bucket + ": " + bwResponse.getHttpStatusCode());
                 throw new OutOfStorageException("CAStor unable to create bucket " + bucket + ": " + bwResponse.getHttpStatusCode());
@@ -279,8 +280,8 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter {
             }
 
             try {
-                ScspResponse bwResponse = myClient(mountedRoot).write(bucket + "/" + fileName, new ResettableFileInputStream(spoolFile), streamLen, domainQueryArg(),
-                    new ScspHeaders());
+                ScspResponse bwResponse =
+                    myClient(mountedRoot).write(bucket + "/" + fileName, new ResettableFileInputStream(spoolFile), streamLen, domainQueryArg(), new ScspHeaders());
                 if (bwResponse.getHttpStatusCode() >= HTTP_UNSUCCESSFUL) {
                     s_logger.error("CAStor write responded with error " + bwResponse.getHttpStatusCode());
                     throw new OutOfStorageException("Unable to write object to CAStor " + bucket + "/" + fileName + ": " + bwResponse.getHttpStatusCode());
@@ -319,7 +320,8 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter {
      * @return OrderedPair with the first value the MD5 of the final object, and the second value the length of the final object
      */
     @Override
-    public OrderedPair<String, Long> concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts, OutputStream client) {
+    public OrderedPair<String, Long> concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts,
+        OutputStream client) {
         // TODO
         throw new UnsupportedException("Multipart upload support not yet implemented in CAStor plugin");
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
index 77d847c..85d1e0e 100644
--- a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
+++ b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
@@ -35,8 +35,8 @@ import com.cloud.bridge.service.core.s3.S3MultipartPart;
 import com.cloud.bridge.service.exception.FileNotExistException;
 import com.cloud.bridge.service.exception.InternalErrorException;
 import com.cloud.bridge.service.exception.OutOfStorageException;
-import com.cloud.bridge.util.StringHelper;
 import com.cloud.bridge.util.OrderedPair;
+import com.cloud.bridge.util.StringHelper;
 
 public class S3FileSystemBucketAdapter implements S3BucketAdapter {
     protected final static Logger logger = Logger.getLogger(S3FileSystemBucketAdapter.class);
@@ -134,7 +134,8 @@ public class S3FileSystemBucketAdapter implements S3BucketAdapter {
      * @return OrderedPair with the first value the MD5 of the final object, and the second value the length of the final object
      */
     @Override
-    public OrderedPair<String, Long> concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts, OutputStream client) {
+    public OrderedPair<String, Long> concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts,
+        OutputStream client) {
         MessageDigest md5;
         long totalLength = 0;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
index eb2831c..aeb6de5 100644
--- a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
+++ b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
@@ -22,7 +22,6 @@ import org.apache.axis2.engine.ServiceLifeCycle;
 import org.apache.log4j.Logger;
 
 import com.cloud.bridge.service.controller.s3.ServiceProvider;
-import com.cloud.utils.db.Transaction;
 
 /**
  * ServiceEngineLifecycle is used to participate Axis service life cycle management

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
index 0802912..a60df06 100644
--- a/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
+++ b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
@@ -18,8 +18,6 @@ package com.cloud.bridge.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/SAcl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SAcl.java b/awsapi/src/com/cloud/bridge/model/SAcl.java
index 79f9932..907fb39 100644
--- a/awsapi/src/com/cloud/bridge/model/SAcl.java
+++ b/awsapi/src/com/cloud/bridge/model/SAcl.java
@@ -16,13 +16,6 @@
 // under the License.
 package com.cloud.bridge.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import com.cloud.bridge.service.exception.UnsupportedException;
-import com.cloud.bridge.util.OrderedPair;
-import com.cloud.bridge.util.Triple;
-
 /**
  * A model of stored ACLs to remember the ACL permissions per canonicalUserID per grantee
  * Hold the AWS S3 grantee and permission constants.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/SBucket.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SBucket.java b/awsapi/src/com/cloud/bridge/model/SBucket.java
index 53b1a5e..033d59c 100644
--- a/awsapi/src/com/cloud/bridge/model/SBucket.java
+++ b/awsapi/src/com/cloud/bridge/model/SBucket.java
@@ -16,11 +16,6 @@
 // under the License.
 package com.cloud.bridge.model;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * Holds the relation
  *  Id,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/SBucketVO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SBucketVO.java b/awsapi/src/com/cloud/bridge/model/SBucketVO.java
index f71688a..cc97e46 100644
--- a/awsapi/src/com/cloud/bridge/model/SBucketVO.java
+++ b/awsapi/src/com/cloud/bridge/model/SBucketVO.java
@@ -16,7 +16,6 @@
 // under the License.
 package com.cloud.bridge.model;
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/SHost.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SHost.java b/awsapi/src/com/cloud/bridge/model/SHost.java
index d085425..6c57857 100644
--- a/awsapi/src/com/cloud/bridge/model/SHost.java
+++ b/awsapi/src/com/cloud/bridge/model/SHost.java
@@ -16,10 +16,6 @@
 // under the License.
 package com.cloud.bridge.model;
 
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
 public interface SHost {
 
     public static final int STORAGE_HOST_TYPE_LOCAL = 0;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java b/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java
index 1fcac58..5eada3c 100644
--- a/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java
+++ b/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java
@@ -16,7 +16,6 @@
 // under the License.
 package com.cloud.bridge.model;
 
-import java.io.Serializable;
 import java.util.Date;
 
 import javax.persistence.Column;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java b/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
index e5d84a4..9a10c2e 100644
--- a/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
+++ b/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.bridge.model;
 
-import java.io.Serializable;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java
index 95c3a90..a18bb4c 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java
@@ -24,7 +24,6 @@ import com.cloud.bridge.model.CloudStackAccountVO;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
index 7f96cac..f36d1e7 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
@@ -26,7 +26,6 @@ import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
index 01de27e..effc381 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
@@ -22,13 +22,9 @@ import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import com.cloud.bridge.model.CloudStackServiceOfferingVO;
-import com.cloud.bridge.model.SHostVO;
-import com.cloud.stack.models.CloudStackConfiguration;
-import com.cloud.stack.models.CloudStackServiceOffering;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
index a28965c..279ee43 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
@@ -22,12 +22,11 @@ import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import com.cloud.bridge.model.CloudStackUserVO;
+import com.cloud.utils.crypt.DBEncryptionUtil;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
-import com.cloud.utils.crypt.DBEncryptionUtil;
 
 @Component
 @Local(value = {CloudStackUserDao.class})

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
index 041cb6d..a592bad 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
@@ -25,7 +25,6 @@ import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java
index bb868a8..929af7a 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java
@@ -24,7 +24,6 @@ import com.cloud.bridge.model.MHostMountVO;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java
index 902e5e8..36a8cdf 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java
@@ -27,7 +27,6 @@ import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java
index a24c7f7..8ef7839 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java
@@ -23,16 +23,12 @@ import javax.ejb.Local;
 
 import org.springframework.stereotype.Component;
 
-import com.cloud.bridge.model.MultiPartPartsVO;
 import com.cloud.bridge.model.MultiPartUploadsVO;
-import com.cloud.bridge.model.SBucketVO;
 import com.cloud.bridge.util.OrderedPair;
-import com.cloud.utils.db.Attribute;
 import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
index 13456d8..ffa1f5d 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
@@ -33,7 +33,6 @@ import com.cloud.bridge.service.core.s3.S3MetaDataEntry;
 import com.cloud.bridge.service.core.s3.S3MultipartPart;
 import com.cloud.bridge.service.core.s3.S3MultipartUpload;
 import com.cloud.bridge.util.OrderedPair;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 public class MultipartLoadDao {
@@ -258,7 +257,8 @@ public class MultipartLoadDao {
      * @return an array of S3MultipartPart objects
      * @throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException
      */
-    public S3MultipartPart[] getParts(int uploadId, int maxParts, int startAt) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException {
+    public S3MultipartPart[] getParts(int uploadId, int maxParts, int startAt) throws InstantiationException, IllegalAccessException, ClassNotFoundException,
+        SQLException {
         S3MultipartPart[] parts = new S3MultipartPart[maxParts];
         int i = 0;
         List<MultiPartPartsVO> partsVO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java
index 97ae09c..e647c0d 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java
@@ -26,7 +26,6 @@ import com.cloud.bridge.model.MultipartMetaVO;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
index b302dda..8508590 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
@@ -17,8 +17,6 @@
 package com.cloud.bridge.persist.dao;
 
 import javax.ejb.Local;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
@@ -27,7 +25,6 @@ import com.cloud.bridge.model.OfferingBundleVO;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java
index 26a65ee..0fb697b 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java
@@ -31,7 +31,6 @@ import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java
index 02d8fa3..a01cce4 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java
@@ -22,13 +22,11 @@ import javax.ejb.Local;
 
 import org.springframework.stereotype.Component;
 
-import com.cloud.bridge.model.SBucket;
 import com.cloud.bridge.model.SBucketVO;
 import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
index d46aa67..a5ebbc1 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
@@ -24,7 +24,6 @@ import com.cloud.bridge.model.SHostVO;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java
index a40ca5a..65a8f6b 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java
@@ -27,7 +27,6 @@ import com.cloud.bridge.service.core.s3.S3MetaDataEntry;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java
index 2e94c7c..f2a00b0 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java
@@ -32,7 +32,6 @@ import com.cloud.bridge.model.SObjectVO;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java
index 33ea03b..30387b8 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java
@@ -26,7 +26,6 @@ import com.cloud.bridge.model.SObjectItemVO;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
index c9dd549..45c4269 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.bridge.persist.dao;
 
-import java.sql.*;
-
 import javax.ejb.Local;
 
 import org.apache.log4j.Logger;
@@ -28,7 +26,6 @@ import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
index a7e00a1..9fc353f 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
@@ -17,7 +17,6 @@
 package com.cloud.bridge.service;
 
 import java.io.IOException;
-
 import java.io.OutputStreamWriter;
 import java.util.UUID;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
index b9e4bd6..5c56e9d 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
@@ -103,6 +103,7 @@ import com.amazon.ec2.RunInstancesResponse;
 import com.amazon.ec2.StartInstancesResponse;
 import com.amazon.ec2.StopInstancesResponse;
 import com.amazon.ec2.TerminateInstancesResponse;
+
 import com.cloud.bridge.model.UserCredentialsVO;
 import com.cloud.bridge.persist.dao.CloudStackUserDaoImpl;
 import com.cloud.bridge.persist.dao.OfferingDaoImpl;
@@ -131,8 +132,8 @@ import com.cloud.bridge.service.core.ec2.EC2Engine;
 import com.cloud.bridge.service.core.ec2.EC2Filter;
 import com.cloud.bridge.service.core.ec2.EC2GroupFilterSet;
 import com.cloud.bridge.service.core.ec2.EC2Image;
-import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet;
 import com.cloud.bridge.service.core.ec2.EC2ImageAttributes.ImageAttribute;
+import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet;
 import com.cloud.bridge.service.core.ec2.EC2ImageLaunchPermission;
 import com.cloud.bridge.service.core.ec2.EC2ImportKeyPair;
 import com.cloud.bridge.service.core.ec2.EC2InstanceFilterSet;
@@ -160,7 +161,6 @@ import com.cloud.bridge.util.AuthenticationUtils;
 import com.cloud.bridge.util.ConfigurationHelper;
 import com.cloud.bridge.util.EC2RestAuth;
 import com.cloud.stack.models.CloudStackAccount;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 @Component("EC2RestServlet")
@@ -829,9 +829,8 @@ public class EC2RestServlet extends HttpServlet {
         }
 
         // -> execute the request
-        RevokeSecurityGroupIngressResponse EC2response = EC2SoapServiceImpl.toRevokeSecurityGroupIngressResponse(ServiceProvider.getInstance()
-            .getEC2Engine()
-            .revokeSecurityGroup(EC2request));
+        RevokeSecurityGroupIngressResponse EC2response =
+            EC2SoapServiceImpl.toRevokeSecurityGroupIngressResponse(ServiceProvider.getInstance().getEC2Engine().revokeSecurityGroup(EC2request));
         serializeResponse(response, EC2response);
     }
 
@@ -915,9 +914,8 @@ public class EC2RestServlet extends HttpServlet {
         }
 
         // -> execute the request
-        AuthorizeSecurityGroupIngressResponse EC2response = EC2SoapServiceImpl.toAuthorizeSecurityGroupIngressResponse(ServiceProvider.getInstance()
-            .getEC2Engine()
-            .authorizeSecurityGroup(EC2request));
+        AuthorizeSecurityGroupIngressResponse EC2response =
+            EC2SoapServiceImpl.toAuthorizeSecurityGroupIngressResponse(ServiceProvider.getInstance().getEC2Engine().authorizeSecurityGroup(EC2request));
         serializeResponse(response, EC2response);
     }
 
@@ -1013,9 +1011,8 @@ public class EC2RestServlet extends HttpServlet {
         }
 
         // -> execute the request
-        CreateSecurityGroupResponse EC2response = EC2SoapServiceImpl.toCreateSecurityGroupResponse(ServiceProvider.getInstance()
-            .getEC2Engine()
-            .createSecurityGroup(groupName, groupDescription));
+        CreateSecurityGroupResponse EC2response =
+            EC2SoapServiceImpl.toCreateSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().createSecurityGroup(groupName, groupDescription));
         serializeResponse(response, EC2response);
     }
 
@@ -1030,7 +1027,8 @@ public class EC2RestServlet extends HttpServlet {
         }
 
         // -> execute the request
-        DeleteSecurityGroupResponse EC2response = EC2SoapServiceImpl.toDeleteSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().deleteSecurityGroup(groupName));
+        DeleteSecurityGroupResponse EC2response =
+            EC2SoapServiceImpl.toDeleteSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().deleteSecurityGroup(groupName));
         serializeResponse(response, EC2response);
     }
 
@@ -1167,7 +1165,8 @@ public class EC2RestServlet extends HttpServlet {
         }
 
         // -> execute the request
-        ModifyImageAttributeResponse EC2response = EC2SoapServiceImpl.toModifyImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request));
+        ModifyImageAttributeResponse EC2response =
+            EC2SoapServiceImpl.toModifyImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request));
         serializeResponse(response, EC2response);
     }
 
@@ -1231,7 +1230,8 @@ public class EC2RestServlet extends HttpServlet {
         ec2request.addLaunchPermission(launchPermission);
 
         // -> execute the request
-        ResetImageAttributeResponse EC2response = EC2SoapServiceImpl.toResetImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request));
+        ResetImageAttributeResponse EC2response =
+            EC2SoapServiceImpl.toResetImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request));
         serializeResponse(response, EC2response);
     }
 
@@ -1442,9 +1442,8 @@ public class EC2RestServlet extends HttpServlet {
         }
 
         // -> execute the request
-        DescribeAvailabilityZonesResponse EC2response = EC2SoapServiceImpl.toDescribeAvailabilityZonesResponse(ServiceProvider.getInstance()
-            .getEC2Engine()
-            .describeAvailabilityZones(EC2request));
+        DescribeAvailabilityZonesResponse EC2response =
+            EC2SoapServiceImpl.toDescribeAvailabilityZonesResponse(ServiceProvider.getInstance().getEC2Engine().describeAvailabilityZones(EC2request));
         serializeResponse(response, EC2response);
     }
 
@@ -1499,9 +1498,8 @@ public class EC2RestServlet extends HttpServlet {
             throw new EC2ServiceException(ClientError.MissingParamter, "Missing required parameter - Attribute");
         }
 
-        DescribeImageAttributeResponse EC2response = EC2SoapServiceImpl.toDescribeImageAttributeResponse(ServiceProvider.getInstance()
-            .getEC2Engine()
-            .describeImageAttribute(ec2request));
+        DescribeImageAttributeResponse EC2response =
+            EC2SoapServiceImpl.toDescribeImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().describeImageAttribute(ec2request));
         serializeResponse(response, EC2response);
     }
 
@@ -1678,9 +1676,8 @@ public class EC2RestServlet extends HttpServlet {
         }
 
         // -> execute the request
-        DescribeInstanceAttributeResponse EC2response = EC2SoapServiceImpl.toDescribeInstanceAttributeResponse(ServiceProvider.getInstance()
-            .getEC2Engine()
-            .describeInstances(EC2request));
+        DescribeInstanceAttributeResponse EC2response =
+            EC2SoapServiceImpl.toDescribeInstanceAttributeResponse(ServiceProvider.getInstance().getEC2Engine().describeInstances(EC2request));
         serializeResponse(response, EC2response);
     }
 
@@ -1709,9 +1706,8 @@ public class EC2RestServlet extends HttpServlet {
         }
 
         // -> execute the request
-        ModifyInstanceAttributeResponse EC2response = EC2SoapServiceImpl.toModifyInstanceAttributeResponse(ServiceProvider.getInstance()
-            .getEC2Engine()
-            .modifyInstanceAttribute(ec2Request));
+        ModifyInstanceAttributeResponse EC2response =
+            EC2SoapServiceImpl.toModifyInstanceAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyInstanceAttribute(ec2Request));
         serializeResponse(response, EC2response);
     }
 
@@ -1769,7 +1765,8 @@ public class EC2RestServlet extends HttpServlet {
 
         // -> execute the request
         EC2Engine engine = ServiceProvider.getInstance().getEC2Engine();
-        DescribeVolumesResponse EC2response = EC2SoapServiceImpl.toDescribeVolumesResponse(ServiceProvider.getInstance().getEC2Engine().describeVolumes(EC2request), engine);
+        DescribeVolumesResponse EC2response =
+            EC2SoapServiceImpl.toDescribeVolumesResponse(ServiceProvider.getInstance().getEC2Engine().describeVolumes(EC2request), engine);
         serializeResponse(response, EC2response);
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapService.java b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
index 5f3c13e..cfad70c 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
@@ -18,7 +18,296 @@ package com.cloud.bridge.service;
 
 import org.apache.log4j.Logger;
 
-import com.amazon.ec2.*;
+import com.amazon.ec2.ActivateLicense;
+import com.amazon.ec2.ActivateLicenseResponse;
+import com.amazon.ec2.AllocateAddress;
+import com.amazon.ec2.AllocateAddressResponse;
+import com.amazon.ec2.AmazonEC2SkeletonInterface;
+import com.amazon.ec2.AssignPrivateIpAddresses;
+import com.amazon.ec2.AssignPrivateIpAddressesResponse;
+import com.amazon.ec2.AssociateAddress;
+import com.amazon.ec2.AssociateAddressResponse;
+import com.amazon.ec2.AssociateDhcpOptions;
+import com.amazon.ec2.AssociateDhcpOptionsResponse;
+import com.amazon.ec2.AssociateRouteTable;
+import com.amazon.ec2.AssociateRouteTableResponse;
+import com.amazon.ec2.AttachInternetGateway;
+import com.amazon.ec2.AttachInternetGatewayResponse;
+import com.amazon.ec2.AttachNetworkInterface;
+import com.amazon.ec2.AttachNetworkInterfaceResponse;
+import com.amazon.ec2.AttachVolume;
+import com.amazon.ec2.AttachVolumeResponse;
+import com.amazon.ec2.AttachVpnGateway;
+import com.amazon.ec2.AttachVpnGatewayResponse;
+import com.amazon.ec2.AuthorizeSecurityGroupEgress;
+import com.amazon.ec2.AuthorizeSecurityGroupEgressResponse;
+import com.amazon.ec2.AuthorizeSecurityGroupIngress;
+import com.amazon.ec2.AuthorizeSecurityGroupIngressResponse;
+import com.amazon.ec2.BundleInstance;
+import com.amazon.ec2.BundleInstanceResponse;
+import com.amazon.ec2.CancelBundleTask;
+import com.amazon.ec2.CancelBundleTaskResponse;
+import com.amazon.ec2.CancelConversionTask;
+import com.amazon.ec2.CancelConversionTaskResponse;
+import com.amazon.ec2.CancelExportTask;
+import com.amazon.ec2.CancelExportTaskResponse;
+import com.amazon.ec2.CancelReservedInstancesListing;
+import com.amazon.ec2.CancelReservedInstancesListingResponse;
+import com.amazon.ec2.CancelSpotInstanceRequests;
+import com.amazon.ec2.CancelSpotInstanceRequestsResponse;
+import com.amazon.ec2.ConfirmProductInstance;
+import com.amazon.ec2.ConfirmProductInstanceResponse;
+import com.amazon.ec2.CreateCustomerGateway;
+import com.amazon.ec2.CreateCustomerGatewayResponse;
+import com.amazon.ec2.CreateDhcpOptions;
+import com.amazon.ec2.CreateDhcpOptionsResponse;
+import com.amazon.ec2.CreateImage;
+import com.amazon.ec2.CreateImageResponse;
+import com.amazon.ec2.CreateInstanceExportTask;
+import com.amazon.ec2.CreateInstanceExportTaskResponse;
+import com.amazon.ec2.CreateInternetGateway;
+import com.amazon.ec2.CreateInternetGatewayResponse;
+import com.amazon.ec2.CreateKeyPair;
+import com.amazon.ec2.CreateKeyPairResponse;
+import com.amazon.ec2.CreateNetworkAcl;
+import com.amazon.ec2.CreateNetworkAclEntry;
+import com.amazon.ec2.CreateNetworkAclEntryResponse;
+import com.amazon.ec2.CreateNetworkAclResponse;
+import com.amazon.ec2.CreateNetworkInterface;
+import com.amazon.ec2.CreateNetworkInterfaceResponse;
+import com.amazon.ec2.CreatePlacementGroup;
+import com.amazon.ec2.CreatePlacementGroupResponse;
+import com.amazon.ec2.CreateReservedInstancesListing;
+import com.amazon.ec2.CreateReservedInstancesListingResponse;
+import com.amazon.ec2.CreateRoute;
+import com.amazon.ec2.CreateRouteResponse;
+import com.amazon.ec2.CreateRouteTable;
+import com.amazon.ec2.CreateRouteTableResponse;
+import com.amazon.ec2.CreateSecurityGroup;
+import com.amazon.ec2.CreateSecurityGroupResponse;
+import com.amazon.ec2.CreateSnapshot;
+import com.amazon.ec2.CreateSnapshotResponse;
+import com.amazon.ec2.CreateSpotDatafeedSubscription;
+import com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.CreateSubnet;
+import com.amazon.ec2.CreateSubnetResponse;
+import com.amazon.ec2.CreateTags;
+import com.amazon.ec2.CreateTagsResponse;
+import com.amazon.ec2.CreateVolume;
+import com.amazon.ec2.CreateVolumeResponse;
+import com.amazon.ec2.CreateVpc;
+import com.amazon.ec2.CreateVpcResponse;
+import com.amazon.ec2.CreateVpnConnection;
+import com.amazon.ec2.CreateVpnConnectionResponse;
+import com.amazon.ec2.CreateVpnConnectionRoute;
+import com.amazon.ec2.CreateVpnConnectionRouteResponse;
+import com.amazon.ec2.CreateVpnGateway;
+import com.amazon.ec2.CreateVpnGatewayResponse;
+import com.amazon.ec2.DeactivateLicense;
+import com.amazon.ec2.DeactivateLicenseResponse;
+import com.amazon.ec2.DeleteCustomerGateway;
+import com.amazon.ec2.DeleteCustomerGatewayResponse;
+import com.amazon.ec2.DeleteDhcpOptions;
+import com.amazon.ec2.DeleteDhcpOptionsResponse;
+import com.amazon.ec2.DeleteInternetGateway;
+import com.amazon.ec2.DeleteInternetGatewayResponse;
+import com.amazon.ec2.DeleteKeyPair;
+import com.amazon.ec2.DeleteKeyPairResponse;
+import com.amazon.ec2.DeleteNetworkAcl;
+import com.amazon.ec2.DeleteNetworkAclEntry;
+import com.amazon.ec2.DeleteNetworkAclEntryResponse;
+import com.amazon.ec2.DeleteNetworkAclResponse;
+import com.amazon.ec2.DeleteNetworkInterface;
+import com.amazon.ec2.DeleteNetworkInterfaceResponse;
+import com.amazon.ec2.DeletePlacementGroup;
+import com.amazon.ec2.DeletePlacementGroupResponse;
+import com.amazon.ec2.DeleteRoute;
+import com.amazon.ec2.DeleteRouteResponse;
+import com.amazon.ec2.DeleteRouteTable;
+import com.amazon.ec2.DeleteRouteTableResponse;
+import com.amazon.ec2.DeleteSecurityGroup;
+import com.amazon.ec2.DeleteSecurityGroupResponse;
+import com.amazon.ec2.DeleteSnapshot;
+import com.amazon.ec2.DeleteSnapshotResponse;
+import com.amazon.ec2.DeleteSpotDatafeedSubscription;
+import com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.DeleteSubnet;
+import com.amazon.ec2.DeleteSubnetResponse;
+import com.amazon.ec2.DeleteTags;
+import com.amazon.ec2.DeleteTagsResponse;
+import com.amazon.ec2.DeleteVolume;
+import com.amazon.ec2.DeleteVolumeResponse;
+import com.amazon.ec2.DeleteVpc;
+import com.amazon.ec2.DeleteVpcResponse;
+import com.amazon.ec2.DeleteVpnConnection;
+import com.amazon.ec2.DeleteVpnConnectionResponse;
+import com.amazon.ec2.DeleteVpnConnectionRoute;
+import com.amazon.ec2.DeleteVpnConnectionRouteResponse;
+import com.amazon.ec2.DeleteVpnGateway;
+import com.amazon.ec2.DeleteVpnGatewayResponse;
+import com.amazon.ec2.DeregisterImage;
+import com.amazon.ec2.DeregisterImageResponse;
+import com.amazon.ec2.DescribeAddresses;
+import com.amazon.ec2.DescribeAddressesResponse;
+import com.amazon.ec2.DescribeAvailabilityZones;
+import com.amazon.ec2.DescribeAvailabilityZonesResponse;
+import com.amazon.ec2.DescribeBundleTasks;
+import com.amazon.ec2.DescribeBundleTasksResponse;
+import com.amazon.ec2.DescribeConversionTasks;
+import com.amazon.ec2.DescribeConversionTasksResponse;
+import com.amazon.ec2.DescribeCustomerGateways;
+import com.amazon.ec2.DescribeCustomerGatewaysResponse;
+import com.amazon.ec2.DescribeDhcpOptions;
+import com.amazon.ec2.DescribeDhcpOptionsResponse;
+import com.amazon.ec2.DescribeExportTasks;
+import com.amazon.ec2.DescribeExportTasksResponse;
+import com.amazon.ec2.DescribeImageAttribute;
+import com.amazon.ec2.DescribeImageAttributeResponse;
+import com.amazon.ec2.DescribeImages;
+import com.amazon.ec2.DescribeImagesResponse;
+import com.amazon.ec2.DescribeInstanceAttribute;
+import com.amazon.ec2.DescribeInstanceAttributeResponse;
+import com.amazon.ec2.DescribeInstanceStatus;
+import com.amazon.ec2.DescribeInstanceStatusResponse;
+import com.amazon.ec2.DescribeInstances;
+import com.amazon.ec2.DescribeInstancesResponse;
+import com.amazon.ec2.DescribeInternetGateways;
+import com.amazon.ec2.DescribeInternetGatewaysResponse;
+import com.amazon.ec2.DescribeKeyPairs;
+import com.amazon.ec2.DescribeKeyPairsResponse;
+import com.amazon.ec2.DescribeLicenses;
+import com.amazon.ec2.DescribeLicensesResponse;
+import com.amazon.ec2.DescribeNetworkAcls;
+import com.amazon.ec2.DescribeNetworkAclsResponse;
+import com.amazon.ec2.DescribeNetworkInterfaceAttribute;
+import com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.DescribeNetworkInterfaces;
+import com.amazon.ec2.DescribeNetworkInterfacesResponse;
+import com.amazon.ec2.DescribePlacementGroups;
+import com.amazon.ec2.DescribePlacementGroupsResponse;
+import com.amazon.ec2.DescribeRegions;
+import com.amazon.ec2.DescribeRegionsResponse;
+import com.amazon.ec2.DescribeReservedInstances;
+import com.amazon.ec2.DescribeReservedInstancesListings;
+import com.amazon.ec2.DescribeReservedInstancesListingsResponse;
+import com.amazon.ec2.DescribeReservedInstancesOfferings;
+import com.amazon.ec2.DescribeReservedInstancesOfferingsResponse;
+import com.amazon.ec2.DescribeReservedInstancesResponse;
+import com.amazon.ec2.DescribeRouteTables;
+import com.amazon.ec2.DescribeRouteTablesResponse;
+import com.amazon.ec2.DescribeSecurityGroups;
+import com.amazon.ec2.DescribeSecurityGroupsResponse;
+import com.amazon.ec2.DescribeSnapshotAttribute;
+import com.amazon.ec2.DescribeSnapshotAttributeResponse;
+import com.amazon.ec2.DescribeSnapshots;
+import com.amazon.ec2.DescribeSnapshotsResponse;
+import com.amazon.ec2.DescribeSpotDatafeedSubscription;
+import com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.DescribeSpotInstanceRequests;
+import com.amazon.ec2.DescribeSpotInstanceRequestsResponse;
+import com.amazon.ec2.DescribeSpotPriceHistory;
+import com.amazon.ec2.DescribeSpotPriceHistoryResponse;
+import com.amazon.ec2.DescribeSubnets;
+import com.amazon.ec2.DescribeSubnetsResponse;
+import com.amazon.ec2.DescribeTags;
+import com.amazon.ec2.DescribeTagsResponse;
+import com.amazon.ec2.DescribeVolumeAttribute;
+import com.amazon.ec2.DescribeVolumeAttributeResponse;
+import com.amazon.ec2.DescribeVolumeStatus;
+import com.amazon.ec2.DescribeVolumeStatusResponse;
+import com.amazon.ec2.DescribeVolumes;
+import com.amazon.ec2.DescribeVolumesResponse;
+import com.amazon.ec2.DescribeVpcs;
+import com.amazon.ec2.DescribeVpcsResponse;
+import com.amazon.ec2.DescribeVpnConnections;
+import com.amazon.ec2.DescribeVpnConnectionsResponse;
+import com.amazon.ec2.DescribeVpnGateways;
+import com.amazon.ec2.DescribeVpnGatewaysResponse;
+import com.amazon.ec2.DetachInternetGateway;
+import com.amazon.ec2.DetachInternetGatewayResponse;
+import com.amazon.ec2.DetachNetworkInterface;
+import com.amazon.ec2.DetachNetworkInterfaceResponse;
+import com.amazon.ec2.DetachVolume;
+import com.amazon.ec2.DetachVolumeResponse;
+import com.amazon.ec2.DetachVpnGateway;
+import com.amazon.ec2.DetachVpnGatewayResponse;
+import com.amazon.ec2.DisableVgwRoutePropagation;
+import com.amazon.ec2.DisableVgwRoutePropagationResponse;
+import com.amazon.ec2.DisassociateAddress;
+import com.amazon.ec2.DisassociateAddressResponse;
+import com.amazon.ec2.DisassociateRouteTable;
+import com.amazon.ec2.DisassociateRouteTableResponse;
+import com.amazon.ec2.EnableVgwRoutePropagation;
+import com.amazon.ec2.EnableVgwRoutePropagationResponse;
+import com.amazon.ec2.EnableVolumeIO;
+import com.amazon.ec2.EnableVolumeIOResponse;
+import com.amazon.ec2.GetConsoleOutput;
+import com.amazon.ec2.GetConsoleOutputResponse;
+import com.amazon.ec2.GetPasswordData;
+import com.amazon.ec2.GetPasswordDataResponse;
+import com.amazon.ec2.ImportInstance;
+import com.amazon.ec2.ImportInstanceResponse;
+import com.amazon.ec2.ImportKeyPair;
+import com.amazon.ec2.ImportKeyPairResponse;
+import com.amazon.ec2.ImportVolume;
+import com.amazon.ec2.ImportVolumeResponse;
+import com.amazon.ec2.ModifyImageAttribute;
+import com.amazon.ec2.ModifyImageAttributeResponse;
+import com.amazon.ec2.ModifyInstanceAttribute;
+import com.amazon.ec2.ModifyInstanceAttributeResponse;
+import com.amazon.ec2.ModifyNetworkInterfaceAttribute;
+import com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.ModifySnapshotAttribute;
+import com.amazon.ec2.ModifySnapshotAttributeResponse;
+import com.amazon.ec2.ModifyVolumeAttribute;
+import com.amazon.ec2.ModifyVolumeAttributeResponse;
+import com.amazon.ec2.MonitorInstances;
+import com.amazon.ec2.MonitorInstancesResponse;
+import com.amazon.ec2.PurchaseReservedInstancesOffering;
+import com.amazon.ec2.PurchaseReservedInstancesOfferingResponse;
+import com.amazon.ec2.RebootInstances;
+import com.amazon.ec2.RebootInstancesResponse;
+import com.amazon.ec2.RegisterImage;
+import com.amazon.ec2.RegisterImageResponse;
+import com.amazon.ec2.ReleaseAddress;
+import com.amazon.ec2.ReleaseAddressResponse;
+import com.amazon.ec2.ReplaceNetworkAclAssociation;
+import com.amazon.ec2.ReplaceNetworkAclAssociationResponse;
+import com.amazon.ec2.ReplaceNetworkAclEntry;
+import com.amazon.ec2.ReplaceNetworkAclEntryResponse;
+import com.amazon.ec2.ReplaceRoute;
+import com.amazon.ec2.ReplaceRouteResponse;
+import com.amazon.ec2.ReplaceRouteTableAssociation;
+import com.amazon.ec2.ReplaceRouteTableAssociationResponse;
+import com.amazon.ec2.ReportInstanceStatus;
+import com.amazon.ec2.ReportInstanceStatusResponse;
+import com.amazon.ec2.RequestSpotInstances;
+import com.amazon.ec2.RequestSpotInstancesResponse;
+import com.amazon.ec2.ResetImageAttribute;
+import com.amazon.ec2.ResetImageAttributeResponse;
+import com.amazon.ec2.ResetInstanceAttribute;
+import com.amazon.ec2.ResetInstanceAttributeResponse;
+import com.amazon.ec2.ResetNetworkInterfaceAttribute;
+import com.amazon.ec2.ResetNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.ResetSnapshotAttribute;
+import com.amazon.ec2.ResetSnapshotAttributeResponse;
+import com.amazon.ec2.RevokeSecurityGroupEgress;
+import com.amazon.ec2.RevokeSecurityGroupEgressResponse;
+import com.amazon.ec2.RevokeSecurityGroupIngress;
+import com.amazon.ec2.RevokeSecurityGroupIngressResponse;
+import com.amazon.ec2.RunInstances;
+import com.amazon.ec2.RunInstancesResponse;
+import com.amazon.ec2.StartInstances;
+import com.amazon.ec2.StartInstancesResponse;
+import com.amazon.ec2.StopInstances;
+import com.amazon.ec2.StopInstancesResponse;
+import com.amazon.ec2.TerminateInstances;
+import com.amazon.ec2.TerminateInstancesResponse;
+import com.amazon.ec2.UnassignPrivateIpAddresses;
+import com.amazon.ec2.UnassignPrivateIpAddressesResponse;
+import com.amazon.ec2.UnmonitorInstances;
+import com.amazon.ec2.UnmonitorInstancesResponse;
+
 import com.cloud.bridge.service.controller.s3.ServiceProvider;
 
 public class EC2SoapService implements AmazonEC2SkeletonInterface {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
index f2fd4a6..dac18e4 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
@@ -26,35 +26,491 @@ import java.util.UUID;
 
 import org.apache.commons.codec.binary.Base64;
 
-import com.amazon.ec2.*;
+import com.amazon.ec2.ActivateLicense;
+import com.amazon.ec2.ActivateLicenseResponse;
+import com.amazon.ec2.AllocateAddress;
+import com.amazon.ec2.AllocateAddressResponse;
+import com.amazon.ec2.AllocateAddressResponseType;
+import com.amazon.ec2.AmazonEC2SkeletonInterface;
+import com.amazon.ec2.AssignPrivateIpAddresses;
+import com.amazon.ec2.AssignPrivateIpAddressesResponse;
+import com.amazon.ec2.AssociateAddress;
+import com.amazon.ec2.AssociateAddressResponse;
+import com.amazon.ec2.AssociateAddressResponseType;
+import com.amazon.ec2.AssociateDhcpOptions;
+import com.amazon.ec2.AssociateDhcpOptionsResponse;
+import com.amazon.ec2.AssociateRouteTable;
+import com.amazon.ec2.AssociateRouteTableResponse;
+import com.amazon.ec2.AttachInternetGateway;
+import com.amazon.ec2.AttachInternetGatewayResponse;
+import com.amazon.ec2.AttachNetworkInterface;
+import com.amazon.ec2.AttachNetworkInterfaceResponse;
+import com.amazon.ec2.AttachVolume;
+import com.amazon.ec2.AttachVolumeResponse;
+import com.amazon.ec2.AttachVolumeResponseType;
+import com.amazon.ec2.AttachVolumeType;
+import com.amazon.ec2.AttachVpnGateway;
+import com.amazon.ec2.AttachVpnGatewayResponse;
+import com.amazon.ec2.AttachmentSetItemResponseType;
+import com.amazon.ec2.AttachmentSetResponseType;
+import com.amazon.ec2.AttributeValueType;
+import com.amazon.ec2.AuthorizeSecurityGroupEgress;
+import com.amazon.ec2.AuthorizeSecurityGroupEgressResponse;
+import com.amazon.ec2.AuthorizeSecurityGroupIngress;
+import com.amazon.ec2.AuthorizeSecurityGroupIngressResponse;
+import com.amazon.ec2.AuthorizeSecurityGroupIngressResponseType;
+import com.amazon.ec2.AuthorizeSecurityGroupIngressType;
+import com.amazon.ec2.AvailabilityZoneItemType;
+import com.amazon.ec2.AvailabilityZoneMessageSetType;
+import com.amazon.ec2.AvailabilityZoneMessageType;
+import com.amazon.ec2.AvailabilityZoneSetType;
+import com.amazon.ec2.BlockDeviceMappingItemType;
+import com.amazon.ec2.BlockDeviceMappingItemTypeChoice_type0;
+import com.amazon.ec2.BlockDeviceMappingType;
+import com.amazon.ec2.BundleInstance;
+import com.amazon.ec2.BundleInstanceResponse;
+import com.amazon.ec2.CancelBundleTask;
+import com.amazon.ec2.CancelBundleTaskResponse;
+import com.amazon.ec2.CancelConversionTask;
+import com.amazon.ec2.CancelConversionTaskResponse;
+import com.amazon.ec2.CancelExportTask;
+import com.amazon.ec2.CancelExportTaskResponse;
+import com.amazon.ec2.CancelReservedInstancesListing;
+import com.amazon.ec2.CancelReservedInstancesListingResponse;
+import com.amazon.ec2.CancelSpotInstanceRequests;
+import com.amazon.ec2.CancelSpotInstanceRequestsResponse;
+import com.amazon.ec2.ConfirmProductInstance;
+import com.amazon.ec2.ConfirmProductInstanceResponse;
+import com.amazon.ec2.CreateCustomerGateway;
+import com.amazon.ec2.CreateCustomerGatewayResponse;
+import com.amazon.ec2.CreateDhcpOptions;
+import com.amazon.ec2.CreateDhcpOptionsResponse;
+import com.amazon.ec2.CreateImage;
+import com.amazon.ec2.CreateImageResponse;
+import com.amazon.ec2.CreateImageResponseType;
+import com.amazon.ec2.CreateImageType;
+import com.amazon.ec2.CreateInstanceExportTask;
+import com.amazon.ec2.CreateInstanceExportTaskResponse;
+import com.amazon.ec2.CreateInternetGateway;
+import com.amazon.ec2.CreateInternetGatewayResponse;
+import com.amazon.ec2.CreateKeyPair;
+import com.amazon.ec2.CreateKeyPairResponse;
+import com.amazon.ec2.CreateKeyPairResponseType;
+import com.amazon.ec2.CreateNetworkAcl;
+import com.amazon.ec2.CreateNetworkAclEntry;
+import com.amazon.ec2.CreateNetworkAclEntryResponse;
+import com.amazon.ec2.CreateNetworkAclResponse;
+import com.amazon.ec2.CreateNetworkInterface;
+import com.amazon.ec2.CreateNetworkInterfaceResponse;
+import com.amazon.ec2.CreatePlacementGroup;
+import com.amazon.ec2.CreatePlacementGroupResponse;
+import com.amazon.ec2.CreateReservedInstancesListing;
+import com.amazon.ec2.CreateReservedInstancesListingResponse;
+import com.amazon.ec2.CreateRoute;
+import com.amazon.ec2.CreateRouteResponse;
+import com.amazon.ec2.CreateRouteTable;
+import com.amazon.ec2.CreateRouteTableResponse;
+import com.amazon.ec2.CreateSecurityGroup;
+import com.amazon.ec2.CreateSecurityGroupResponse;
+import com.amazon.ec2.CreateSecurityGroupResponseType;
+import com.amazon.ec2.CreateSecurityGroupType;
+import com.amazon.ec2.CreateSnapshot;
+import com.amazon.ec2.CreateSnapshotResponse;
+import com.amazon.ec2.CreateSnapshotResponseType;
+import com.amazon.ec2.CreateSnapshotType;
+import com.amazon.ec2.CreateSpotDatafeedSubscription;
+import com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.CreateSubnet;
+import com.amazon.ec2.CreateSubnetResponse;
+import com.amazon.ec2.CreateTags;
+import com.amazon.ec2.CreateTagsResponse;
+import com.amazon.ec2.CreateTagsResponseType;
+import com.amazon.ec2.CreateTagsType;
+import com.amazon.ec2.CreateVolume;
+import com.amazon.ec2.CreateVolumeResponse;
+import com.amazon.ec2.CreateVolumeResponseType;
+import com.amazon.ec2.CreateVolumeType;
+import com.amazon.ec2.CreateVpc;
+import com.amazon.ec2.CreateVpcResponse;
+import com.amazon.ec2.CreateVpnConnection;
+import com.amazon.ec2.CreateVpnConnectionResponse;
+import com.amazon.ec2.CreateVpnConnectionRoute;
+import com.amazon.ec2.CreateVpnConnectionRouteResponse;
+import com.amazon.ec2.CreateVpnGateway;
+import com.amazon.ec2.CreateVpnGatewayResponse;
+import com.amazon.ec2.DeactivateLicense;
+import com.amazon.ec2.DeactivateLicenseResponse;
+import com.amazon.ec2.DeleteCustomerGateway;
+import com.amazon.ec2.DeleteCustomerGatewayResponse;
+import com.amazon.ec2.DeleteDhcpOptions;
+import com.amazon.ec2.DeleteDhcpOptionsResponse;
+import com.amazon.ec2.DeleteInternetGateway;
+import com.amazon.ec2.DeleteInternetGatewayResponse;
+import com.amazon.ec2.DeleteKeyPair;
+import com.amazon.ec2.DeleteKeyPairResponse;
+import com.amazon.ec2.DeleteKeyPairResponseType;
+import com.amazon.ec2.DeleteNetworkAcl;
+import com.amazon.ec2.DeleteNetworkAclEntry;
+import com.amazon.ec2.DeleteNetworkAclEntryResponse;
+import com.amazon.ec2.DeleteNetworkAclResponse;
+import com.amazon.ec2.DeleteNetworkInterface;
+import com.amazon.ec2.DeleteNetworkInterfaceResponse;
+import com.amazon.ec2.DeletePlacementGroup;
+import com.amazon.ec2.DeletePlacementGroupResponse;
+import com.amazon.ec2.DeleteRoute;
+import com.amazon.ec2.DeleteRouteResponse;
+import com.amazon.ec2.DeleteRouteTable;
+import com.amazon.ec2.DeleteRouteTableResponse;
+import com.amazon.ec2.DeleteSecurityGroup;
+import com.amazon.ec2.DeleteSecurityGroupResponse;
+import com.amazon.ec2.DeleteSecurityGroupResponseType;
+import com.amazon.ec2.DeleteSecurityGroupType;
+import com.amazon.ec2.DeleteSnapshot;
+import com.amazon.ec2.DeleteSnapshotResponse;
+import com.amazon.ec2.DeleteSnapshotResponseType;
+import com.amazon.ec2.DeleteSnapshotType;
+import com.amazon.ec2.DeleteSpotDatafeedSubscription;
+import com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.DeleteSubnet;
+import com.amazon.ec2.DeleteSubnetResponse;
+import com.amazon.ec2.DeleteTags;
+import com.amazon.ec2.DeleteTagsResponse;
+import com.amazon.ec2.DeleteTagsResponseType;
+import com.amazon.ec2.DeleteTagsSetItemType;
+import com.amazon.ec2.DeleteTagsSetType;
+import com.amazon.ec2.DeleteTagsType;
+import com.amazon.ec2.DeleteVolume;
+import com.amazon.ec2.DeleteVolumeResponse;
+import com.amazon.ec2.DeleteVolumeResponseType;
+import com.amazon.ec2.DeleteVolumeType;
+import com.amazon.ec2.DeleteVpc;
+import com.amazon.ec2.DeleteVpcResponse;
+import com.amazon.ec2.DeleteVpnConnection;
+import com.amazon.ec2.DeleteVpnConnectionResponse;
+import com.amazon.ec2.DeleteVpnConnectionRoute;
+import com.amazon.ec2.DeleteVpnConnectionRouteResponse;
+import com.amazon.ec2.DeleteVpnGateway;
+import com.amazon.ec2.DeleteVpnGatewayResponse;
+import com.amazon.ec2.DeregisterImage;
+import com.amazon.ec2.DeregisterImageResponse;
+import com.amazon.ec2.DeregisterImageResponseType;
+import com.amazon.ec2.DeregisterImageType;
+import com.amazon.ec2.DescribeAddresses;
+import com.amazon.ec2.DescribeAddressesInfoType;
+import com.amazon.ec2.DescribeAddressesItemType;
+import com.amazon.ec2.DescribeAddressesResponse;
+import com.amazon.ec2.DescribeAddressesResponseInfoType;
+import com.amazon.ec2.DescribeAddressesResponseItemType;
+import com.amazon.ec2.DescribeAddressesResponseType;
+import com.amazon.ec2.DescribeAddressesType;
+import com.amazon.ec2.DescribeAvailabilityZones;
+import com.amazon.ec2.DescribeAvailabilityZonesResponse;
+import com.amazon.ec2.DescribeAvailabilityZonesResponseType;
+import com.amazon.ec2.DescribeAvailabilityZonesSetItemType;
+import com.amazon.ec2.DescribeAvailabilityZonesSetType;
+import com.amazon.ec2.DescribeAvailabilityZonesType;
+import com.amazon.ec2.DescribeBundleTasks;
+import com.amazon.ec2.DescribeBundleTasksResponse;
+import com.amazon.ec2.DescribeConversionTasks;
+import com.amazon.ec2.DescribeConversionTasksResponse;
+import com.amazon.ec2.DescribeCustomerGateways;
+import com.amazon.ec2.DescribeCustomerGatewaysResponse;
+import com.amazon.ec2.DescribeDhcpOptions;
+import com.amazon.ec2.DescribeDhcpOptionsResponse;
+import com.amazon.ec2.DescribeExportTasks;
+import com.amazon.ec2.DescribeExportTasksResponse;
+import com.amazon.ec2.DescribeImageAttribute;
+import com.amazon.ec2.DescribeImageAttributeResponse;
+import com.amazon.ec2.DescribeImageAttributeResponseType;
+import com.amazon.ec2.DescribeImageAttributeResponseTypeChoice_type0;
+import com.amazon.ec2.DescribeImageAttributeType;
+import com.amazon.ec2.DescribeImageAttributesGroup;
+import com.amazon.ec2.DescribeImages;
+import com.amazon.ec2.DescribeImagesExecutableBySetType;
+import com.amazon.ec2.DescribeImagesExecutableByType;
+import com.amazon.ec2.DescribeImagesInfoType;
+import com.amazon.ec2.DescribeImagesItemType;
+import com.amazon.ec2.DescribeImagesOwnerType;
+import com.amazon.ec2.DescribeImagesOwnersType;
+import com.amazon.ec2.DescribeImagesResponse;
+import com.amazon.ec2.DescribeImagesResponseInfoType;
+import com.amazon.ec2.DescribeImagesResponseItemType;
+import com.amazon.ec2.DescribeImagesResponseType;
+import com.amazon.ec2.DescribeImagesType;
+import com.amazon.ec2.DescribeInstanceAttribute;
+import com.amazon.ec2.DescribeInstanceAttributeResponse;
+import com.amazon.ec2.DescribeInstanceAttributeResponseType;
+import com.amazon.ec2.DescribeInstanceAttributeResponseTypeChoice_type0;
+import com.amazon.ec2.DescribeInstanceAttributeType;
+import com.amazon.ec2.DescribeInstanceAttributesGroup;
+import com.amazon.ec2.DescribeInstanceStatus;
+import com.amazon.ec2.DescribeInstanceStatusResponse;
+import com.amazon.ec2.DescribeInstances;
+import com.amazon.ec2.DescribeInstancesInfoType;
+import com.amazon.ec2.DescribeInstancesItemType;
+import com.amazon.ec2.DescribeInstancesResponse;
+import com.amazon.ec2.DescribeInstancesResponseType;
+import com.amazon.ec2.DescribeInstancesType;
+import com.amazon.ec2.DescribeInternetGateways;
+import com.amazon.ec2.DescribeInternetGatewaysResponse;
+import com.amazon.ec2.DescribeKeyPairs;
+import com.amazon.ec2.DescribeKeyPairsInfoType;
+import com.amazon.ec2.DescribeKeyPairsItemType;
+import com.amazon.ec2.DescribeKeyPairsResponse;
+import com.amazon.ec2.DescribeKeyPairsResponseInfoType;
+import com.amazon.ec2.DescribeKeyPairsResponseItemType;
+import com.amazon.ec2.DescribeKeyPairsResponseType;
+import com.amazon.ec2.DescribeLicenses;
+import com.amazon.ec2.DescribeLicensesResponse;
+import com.amazon.ec2.DescribeNetworkAcls;
+import com.amazon.ec2.DescribeNetworkAclsResponse;
+import com.amazon.ec2.DescribeNetworkInterfaceAttribute;
+import com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.DescribeNetworkInterfaces;
+import com.amazon.ec2.DescribeNetworkInterfacesResponse;
+import com.amazon.ec2.DescribePlacementGroups;
+import com.amazon.ec2.DescribePlacementGroupsResponse;
+import com.amazon.ec2.DescribeRegions;
+import com.amazon.ec2.DescribeRegionsResponse;
+import com.amazon.ec2.DescribeReservedInstances;
+import com.amazon.ec2.DescribeReservedInstancesListings;
+import com.amazon.ec2.DescribeReservedInstancesListingsResponse;
+import com.amazon.ec2.DescribeReservedInstancesOfferings;
+import com.amazon.ec2.DescribeReservedInstancesOfferingsResponse;
+import com.amazon.ec2.DescribeReservedInstancesResponse;
+import com.amazon.ec2.DescribeRouteTables;
+import com.amazon.ec2.DescribeRouteTablesResponse;
+import com.amazon.ec2.DescribeSecurityGroups;
+import com.amazon.ec2.DescribeSecurityGroupsResponse;
+import com.amazon.ec2.DescribeSecurityGroupsResponseType;
+import com.amazon.ec2.DescribeSecurityGroupsSetItemType;
+import com.amazon.ec2.DescribeSecurityGroupsSetType;
+import com.amazon.ec2.DescribeSecurityGroupsType;
+import com.amazon.ec2.DescribeSnapshotAttribute;
+import com.amazon.ec2.DescribeSnapshotAttributeResponse;
+import com.amazon.ec2.DescribeSnapshots;
+import com.amazon.ec2.DescribeSnapshotsResponse;
+import com.amazon.ec2.DescribeSnapshotsResponseType;
+import com.amazon.ec2.DescribeSnapshotsSetItemResponseType;
+import com.amazon.ec2.DescribeSnapshotsSetItemType;
+import com.amazon.ec2.DescribeSnapshotsSetResponseType;
+import com.amazon.ec2.DescribeSnapshotsSetType;
+import com.amazon.ec2.DescribeSnapshotsType;
+import com.amazon.ec2.DescribeSpotDatafeedSubscription;
+import com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.DescribeSpotInstanceRequests;
+import com.amazon.ec2.DescribeSpotInstanceRequestsResponse;
+import com.amazon.ec2.DescribeSpotPriceHistory;
+import com.amazon.ec2.DescribeSpotPriceHistoryResponse;
+import com.amazon.ec2.DescribeSubnets;
+import com.amazon.ec2.DescribeSubnetsResponse;
+import com.amazon.ec2.DescribeTags;
+import com.amazon.ec2.DescribeTagsResponse;
+import com.amazon.ec2.DescribeTagsResponseType;
+import com.amazon.ec2.DescribeTagsType;
+import com.amazon.ec2.DescribeVolumeAttribute;
+import com.amazon.ec2.DescribeVolumeAttributeResponse;
+import com.amazon.ec2.DescribeVolumeStatus;
+import com.amazon.ec2.DescribeVolumeStatusResponse;
+import com.amazon.ec2.DescribeVolumes;
+import com.amazon.ec2.DescribeVolumesResponse;
+import com.amazon.ec2.DescribeVolumesResponseType;
+import com.amazon.ec2.DescribeVolumesSetItemResponseType;
+import com.amazon.ec2.DescribeVolumesSetItemType;
+import com.amazon.ec2.DescribeVolumesSetResponseType;
+import com.amazon.ec2.DescribeVolumesSetType;
+import com.amazon.ec2.DescribeVolumesType;
+import com.amazon.ec2.DescribeVpcs;
+import com.amazon.ec2.DescribeVpcsResponse;
+import com.amazon.ec2.DescribeVpnConnections;
+import com.amazon.ec2.DescribeVpnConnectionsResponse;
+import com.amazon.ec2.DescribeVpnGateways;
+import com.amazon.ec2.DescribeVpnGatewaysResponse;
+import com.amazon.ec2.DetachInternetGateway;
+import com.amazon.ec2.DetachInternetGatewayResponse;
+import com.amazon.ec2.DetachNetworkInterface;
+import com.amazon.ec2.DetachNetworkInterfaceResponse;
+import com.amazon.ec2.DetachVolume;
+import com.amazon.ec2.DetachVolumeResponse;
+import com.amazon.ec2.DetachVolumeResponseType;
+import com.amazon.ec2.DetachVolumeType;
+import com.amazon.ec2.DetachVpnGateway;
+import com.amazon.ec2.DetachVpnGatewayResponse;
+import com.amazon.ec2.DisableVgwRoutePropagation;
+import com.amazon.ec2.DisableVgwRoutePropagationResponse;
+import com.amazon.ec2.DisassociateAddress;
+import com.amazon.ec2.DisassociateAddressResponse;
+import com.amazon.ec2.DisassociateAddressResponseType;
+import com.amazon.ec2.DisassociateRouteTable;
+import com.amazon.ec2.DisassociateRouteTableResponse;
+import com.amazon.ec2.EbsBlockDeviceType;
+import com.amazon.ec2.EmptyElementType;
+import com.amazon.ec2.EnableVgwRoutePropagation;
+import com.amazon.ec2.EnableVgwRoutePropagationResponse;
+import com.amazon.ec2.EnableVolumeIO;
+import com.amazon.ec2.EnableVolumeIOResponse;
+import com.amazon.ec2.FilterSetType;
+import com.amazon.ec2.FilterType;
+import com.amazon.ec2.GetConsoleOutput;
+import com.amazon.ec2.GetConsoleOutputResponse;
+import com.amazon.ec2.GetPasswordData;
+import com.amazon.ec2.GetPasswordDataResponse;
+import com.amazon.ec2.GetPasswordDataResponseType;
+import com.amazon.ec2.GroupItemType;
+import com.amazon.ec2.GroupSetType;
+import com.amazon.ec2.ImportInstance;
+import com.amazon.ec2.ImportInstanceResponse;
+import com.amazon.ec2.ImportKeyPair;
+import com.amazon.ec2.ImportKeyPairResponse;
+import com.amazon.ec2.ImportKeyPairResponseType;
+import com.amazon.ec2.ImportVolume;
+import com.amazon.ec2.ImportVolumeResponse;
+import com.amazon.ec2.InstanceIdSetType;
+import com.amazon.ec2.InstanceIdType;
+import com.amazon.ec2.InstanceMonitoringStateType;
+import com.amazon.ec2.InstanceStateChangeSetType;
+import com.amazon.ec2.InstanceStateChangeType;
+import com.amazon.ec2.InstanceStateType;
+import com.amazon.ec2.IpPermissionSetType;
+import com.amazon.ec2.IpPermissionType;
+import com.amazon.ec2.IpRangeItemType;
+import com.amazon.ec2.IpRangeSetType;
+import com.amazon.ec2.LaunchPermissionItemType;
+import com.amazon.ec2.LaunchPermissionListType;
+import com.amazon.ec2.LaunchPermissionOperationType;
+import com.amazon.ec2.ModifyImageAttribute;
+import com.amazon.ec2.ModifyImageAttributeResponse;
+import com.amazon.ec2.ModifyImageAttributeResponseType;
+import com.amazon.ec2.ModifyImageAttributeType;
+import com.amazon.ec2.ModifyImageAttributeTypeChoice_type0;
+import com.amazon.ec2.ModifyInstanceAttribute;
+import com.amazon.ec2.ModifyInstanceAttributeResponse;
+import com.amazon.ec2.ModifyInstanceAttributeResponseType;
+import com.amazon.ec2.ModifyInstanceAttributeType;
+import com.amazon.ec2.ModifyInstanceAttributeTypeChoice_type0;
+import com.amazon.ec2.ModifyNetworkInterfaceAttribute;
+import com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.ModifySnapshotAttribute;
+import com.amazon.ec2.ModifySnapshotAttributeResponse;
+import com.amazon.ec2.ModifyVolumeAttribute;
+import com.amazon.ec2.ModifyVolumeAttributeResponse;
+import com.amazon.ec2.MonitorInstances;
+import com.amazon.ec2.MonitorInstancesResponse;
+import com.amazon.ec2.MonitorInstancesResponseSetItemType;
+import com.amazon.ec2.MonitorInstancesResponseSetType;
+import com.amazon.ec2.MonitorInstancesResponseType;
+import com.amazon.ec2.MonitorInstancesSetItemType;
+import com.amazon.ec2.MonitorInstancesSetType;
+import com.amazon.ec2.MonitorInstancesType;
+import com.amazon.ec2.NullableAttributeValueType;
+import com.amazon.ec2.PlacementRequestType;
+import com.amazon.ec2.PlacementResponseType;
+import com.amazon.ec2.ProductCodesSetItemType;
+import com.amazon.ec2.ProductCodesSetType;
+import com.amazon.ec2.PurchaseReservedInstancesOffering;
+import com.amazon.ec2.PurchaseReservedInstancesOfferingResponse;
+import com.amazon.ec2.RebootInstances;
+import com.amazon.ec2.RebootInstancesInfoType;
+import com.amazon.ec2.RebootInstancesItemType;
+import com.amazon.ec2.RebootInstancesResponse;
+import com.amazon.ec2.RebootInstancesResponseType;
+import com.amazon.ec2.RebootInstancesType;
+import com.amazon.ec2.RegisterImage;
+import com.amazon.ec2.RegisterImageResponse;
+import com.amazon.ec2.RegisterImageResponseType;
+import com.amazon.ec2.RegisterImageType;
+import com.amazon.ec2.ReleaseAddress;
+import com.amazon.ec2.ReleaseAddressResponse;
+import com.amazon.ec2.ReleaseAddressResponseType;
+import com.amazon.ec2.ReplaceNetworkAclAssociation;
+import com.amazon.ec2.ReplaceNetworkAclAssociationResponse;
+import com.amazon.ec2.ReplaceNetworkAclEntry;
+import com.amazon.ec2.ReplaceNetworkAclEntryResponse;
+import com.amazon.ec2.ReplaceRoute;
+import com.amazon.ec2.ReplaceRouteResponse;
+import com.amazon.ec2.ReplaceRouteTableAssociation;
+import com.amazon.ec2.ReplaceRouteTableAssociationResponse;
+import com.amazon.ec2.ReportInstanceStatus;
+import com.amazon.ec2.ReportInstanceStatusResponse;
+import com.amazon.ec2.RequestSpotInstances;
+import com.amazon.ec2.RequestSpotInstancesResponse;
+import com.amazon.ec2.ReservationInfoType;
+import com.amazon.ec2.ReservationSetType;
+import com.amazon.ec2.ResetImageAttribute;
+import com.amazon.ec2.ResetImageAttributeResponse;
+import com.amazon.ec2.ResetImageAttributeResponseType;
+import com.amazon.ec2.ResetImageAttributeType;
+import com.amazon.ec2.ResetInstanceAttribute;
+import com.amazon.ec2.ResetInstanceAttributeResponse;
+import com.amazon.ec2.ResetNetworkInterfaceAttribute;
+import com.amazon.ec2.ResetNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.ResetSnapshotAttribute;
+import com.amazon.ec2.ResetSnapshotAttributeResponse;
+import com.amazon.ec2.ResourceIdSetItemType;
+import com.amazon.ec2.ResourceIdSetType;
+import com.amazon.ec2.ResourceTagSetItemType;
+import com.amazon.ec2.ResourceTagSetType;
+import com.amazon.ec2.RevokeSecurityGroupEgress;
+import com.amazon.ec2.RevokeSecurityGroupEgressResponse;
+import com.amazon.ec2.RevokeSecurityGroupIngress;
+import com.amazon.ec2.RevokeSecurityGroupIngressResponse;
+import com.amazon.ec2.RevokeSecurityGroupIngressResponseType;
+import com.amazon.ec2.RevokeSecurityGroupIngressType;
+import com.amazon.ec2.RunInstances;
+import com.amazon.ec2.RunInstancesResponse;
+import com.amazon.ec2.RunInstancesResponseType;
+import com.amazon.ec2.RunInstancesType;
+import com.amazon.ec2.RunningInstancesItemType;
+import com.amazon.ec2.RunningInstancesSetType;
+import com.amazon.ec2.SecurityGroupItemType;
+import com.amazon.ec2.SecurityGroupSetType;
+import com.amazon.ec2.StartInstances;
+import com.amazon.ec2.StartInstancesResponse;
+import com.amazon.ec2.StartInstancesResponseType;
+import com.amazon.ec2.StartInstancesType;
+import com.amazon.ec2.StateReasonType;
+import com.amazon.ec2.StopInstances;
+import com.amazon.ec2.StopInstancesResponse;
+import com.amazon.ec2.StopInstancesResponseType;
+import com.amazon.ec2.StopInstancesType;
+import com.amazon.ec2.TagSetItemType;
+import com.amazon.ec2.TagSetType;
+import com.amazon.ec2.TerminateInstances;
+import com.amazon.ec2.TerminateInstancesResponse;
+import com.amazon.ec2.TerminateInstancesResponseType;
+import com.amazon.ec2.TerminateInstancesType;
+import com.amazon.ec2.UnassignPrivateIpAddresses;
+import com.amazon.ec2.UnassignPrivateIpAddressesResponse;
+import com.amazon.ec2.UnmonitorInstances;
+import com.amazon.ec2.UnmonitorInstancesResponse;
+import com.amazon.ec2.UserDataType;
+import com.amazon.ec2.UserIdGroupPairSetType;
+import com.amazon.ec2.UserIdGroupPairType;
+import com.amazon.ec2.ValueSetType;
+import com.amazon.ec2.ValueType;
+
 import com.cloud.bridge.service.core.ec2.EC2Address;
 import com.cloud.bridge.service.core.ec2.EC2AddressFilterSet;
 import com.cloud.bridge.service.core.ec2.EC2AssociateAddress;
 import com.cloud.bridge.service.core.ec2.EC2AuthorizeRevokeSecurityGroup;
+import com.cloud.bridge.service.core.ec2.EC2AvailabilityZone;
 import com.cloud.bridge.service.core.ec2.EC2AvailabilityZonesFilterSet;
 import com.cloud.bridge.service.core.ec2.EC2CreateImage;
 import com.cloud.bridge.service.core.ec2.EC2CreateImageResponse;
 import com.cloud.bridge.service.core.ec2.EC2CreateKeyPair;
 import com.cloud.bridge.service.core.ec2.EC2CreateVolume;
-import com.cloud.bridge.service.core.ec2.EC2Tags;
 import com.cloud.bridge.service.core.ec2.EC2DeleteKeyPair;
 import com.cloud.bridge.service.core.ec2.EC2DescribeAddresses;
 import com.cloud.bridge.service.core.ec2.EC2DescribeAddressesResponse;
 import com.cloud.bridge.service.core.ec2.EC2DescribeAvailabilityZones;
 import com.cloud.bridge.service.core.ec2.EC2DescribeAvailabilityZonesResponse;
 import com.cloud.bridge.service.core.ec2.EC2DescribeImageAttribute;
-
-import com.cloud.bridge.service.core.ec2.EC2AvailabilityZone;
 import com.cloud.bridge.service.core.ec2.EC2DescribeImages;
 import com.cloud.bridge.service.core.ec2.EC2DescribeImagesResponse;
 import com.cloud.bridge.service.core.ec2.EC2DescribeInstances;
 import com.cloud.bridge.service.core.ec2.EC2DescribeInstancesResponse;
 import com.cloud.bridge.service.core.ec2.EC2DescribeKeyPairs;
 import com.cloud.bridge.service.core.ec2.EC2DescribeKeyPairsResponse;
-import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet;
-import com.cloud.bridge.service.core.ec2.EC2ImageLaunchPermission;
-import com.cloud.bridge.service.core.ec2.EC2ModifyInstanceAttribute;
-import com.cloud.bridge.service.core.ec2.EC2ResourceTag;
 import com.cloud.bridge.service.core.ec2.EC2DescribeSecurityGroups;
 import com.cloud.bridge.service.core.ec2.EC2DescribeSecurityGroupsResponse;
 import com.cloud.bridge.service.core.ec2.EC2DescribeSnapshots;
@@ -70,18 +526,20 @@ import com.cloud.bridge.service.core.ec2.EC2GroupFilterSet;
 import com.cloud.bridge.service.core.ec2.EC2Image;
 import com.cloud.bridge.service.core.ec2.EC2ImageAttributes;
 import com.cloud.bridge.service.core.ec2.EC2ImageAttributes.ImageAttribute;
+import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet;
+import com.cloud.bridge.service.core.ec2.EC2ImageLaunchPermission;
 import com.cloud.bridge.service.core.ec2.EC2ImportKeyPair;
 import com.cloud.bridge.service.core.ec2.EC2Instance;
 import com.cloud.bridge.service.core.ec2.EC2InstanceFilterSet;
 import com.cloud.bridge.service.core.ec2.EC2IpPermission;
 import com.cloud.bridge.service.core.ec2.EC2KeyPairFilterSet;
 import com.cloud.bridge.service.core.ec2.EC2ModifyImageAttribute;
+import com.cloud.bridge.service.core.ec2.EC2ModifyInstanceAttribute;
 import com.cloud.bridge.service.core.ec2.EC2PasswordData;
 import com.cloud.bridge.service.core.ec2.EC2RebootInstances;
 import com.cloud.bridge.service.core.ec2.EC2RegisterImage;
 import com.cloud.bridge.service.core.ec2.EC2ReleaseAddress;
-import com.cloud.bridge.service.core.ec2.EC2TagKeyValue;
-import com.cloud.bridge.service.core.ec2.EC2TagTypeId;
+import com.cloud.bridge.service.core.ec2.EC2ResourceTag;
 import com.cloud.bridge.service.core.ec2.EC2RunInstances;
 import com.cloud.bridge.service.core.ec2.EC2RunInstancesResponse;
 import com.cloud.bridge.service.core.ec2.EC2SSHKeyPair;
@@ -92,6 +550,9 @@ import com.cloud.bridge.service.core.ec2.EC2StartInstances;
 import com.cloud.bridge.service.core.ec2.EC2StartInstancesResponse;
 import com.cloud.bridge.service.core.ec2.EC2StopInstances;
 import com.cloud.bridge.service.core.ec2.EC2StopInstancesResponse;
+import com.cloud.bridge.service.core.ec2.EC2TagKeyValue;
+import com.cloud.bridge.service.core.ec2.EC2TagTypeId;
+import com.cloud.bridge.service.core.ec2.EC2Tags;
 import com.cloud.bridge.service.core.ec2.EC2TagsFilterSet;
 import com.cloud.bridge.service.core.ec2.EC2Volume;
 import com.cloud.bridge.service.core.ec2.EC2VolumeFilterSet;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/S3RestServlet.java b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
index e001b25..70d6d0b 100644
--- a/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
@@ -66,7 +66,6 @@ import com.cloud.bridge.util.HeaderParam;
 import com.cloud.bridge.util.RestAuth;
 import com.cloud.bridge.util.S3SoapAuth;
 import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionLegacy;
 
 public class S3RestServlet extends HttpServlet {
@@ -306,8 +305,8 @@ public class S3RestServlet extends HttpServlet {
         return params;
     }
 
-    public static void authenticateRequest(HttpServletRequest request, S3AuthParams params) throws InstantiationException, IllegalAccessException, ClassNotFoundException,
-        SQLException {
+    public static void authenticateRequest(HttpServletRequest request, S3AuthParams params) throws InstantiationException, IllegalAccessException,
+        ClassNotFoundException, SQLException {
         RestAuth auth = new RestAuth(ServiceProvider.getInstance().getUseSubDomain());
         String AWSAccessKey = null;
         String signature = null;


Mime
View raw message