You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2013/07/04 08:28:10 UTC

[01/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Updated Branches:
  refs/heads/master 43ab9506a -> 26af71b23


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
index 7a82336..184f4d4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeConversionTasksResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeConversionTasksResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -48,6 +32,36 @@
         
 
                         /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
                         * field for ConversionTasks
                         */
 
@@ -160,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeConversionTasksResponseType",
@@ -174,10 +188,44 @@
                
                    }
                
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
                                             if (localConversionTasks==null){
                                                  throw new org.apache.axis2.databinding.ADBException("conversionTasks cannot be null!!");
                                             }
-                                           localConversionTasks.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","conversionTasks"),
+                                           localConversionTasks.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","conversionTasks"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -342,7 +390,16 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "conversionTasks"));
                             
                             
@@ -429,7 +486,26 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","conversionTasks").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","conversionTasks").equals(reader.getName())){
                                 
                                                 object.setConversionTasks(com.amazon.ec2.ConversionTaskSetType.Factory.parse(reader));
                                               


[27/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
new file mode 100644
index 0000000..cf8730d
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
@@ -0,0 +1,544 @@
+
+/**
+ * CreateInternetGatewayResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateInternetGatewayResponseType bean class
+            */
+        
+        public  class CreateInternetGatewayResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateInternetGatewayResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for InternetGateway
+                        */
+
+                        
+                                    protected com.amazon.ec2.InternetGatewayType localInternetGateway ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.InternetGatewayType
+                           */
+                           public  com.amazon.ec2.InternetGatewayType getInternetGateway(){
+                               return localInternetGateway;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param InternetGateway
+                               */
+                               public void setInternetGateway(com.amazon.ec2.InternetGatewayType param){
+                            
+                                            this.localInternetGateway=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateInternetGatewayResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateInternetGatewayResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateInternetGatewayResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                            if (localInternetGateway==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("internetGateway cannot be null!!");
+                                            }
+                                           localInternetGateway.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","internetGateway"),
+                                               factory,xmlWriter);
+                                        
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "internetGateway"));
+                            
+                            
+                                    if (localInternetGateway==null){
+                                         throw new org.apache.axis2.databinding.ADBException("internetGateway cannot be null!!");
+                                    }
+                                    elementList.add(localInternetGateway);
+                                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateInternetGatewayResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateInternetGatewayResponseType object =
+                new CreateInternetGatewayResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateInternetGatewayResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateInternetGatewayResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","internetGateway").equals(reader.getName())){
+                                
+                                                object.setInternetGateway(com.amazon.ec2.InternetGatewayType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
new file mode 100644
index 0000000..e6b401f
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
@@ -0,0 +1,384 @@
+
+/**
+ * CreateInternetGatewayType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateInternetGatewayType bean class
+            */
+        
+        public  class CreateInternetGatewayType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateInternetGatewayType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateInternetGatewayType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateInternetGatewayType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateInternetGatewayType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateInternetGatewayType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateInternetGatewayType object =
+                new CreateInternetGatewayType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateInternetGatewayType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateInternetGatewayType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateKeyPair.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPair.java b/awsapi/src/com/amazon/ec2/CreateKeyPair.java
index caa2e2d..c640861 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPair.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPair.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateKeyPair.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateKeyPair",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateKeyPair").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateKeyPair").equals(reader.getName())){
                                 
                                                 object.setCreateKeyPair(com.amazon.ec2.CreateKeyPairType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java b/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
index 67abefe..149a714 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateKeyPairResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateKeyPairResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateKeyPairResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateKeyPairResponse").equals(reader.getName())){
                                 
                                                 object.setCreateKeyPairResponse(com.amazon.ec2.CreateKeyPairResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
index 05186eb..4df22de 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateKeyPairResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateKeyPairResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -250,7 +234,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateKeyPairResponseType",
@@ -264,7 +248,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -298,7 +282,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -332,7 +316,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -366,7 +350,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -562,7 +546,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -571,7 +555,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "keyName"));
                                  
                                         if (localKeyName != null){
@@ -580,7 +564,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("keyName cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "keyFingerprint"));
                                  
                                         if (localKeyFingerprint != null){
@@ -589,7 +573,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("keyFingerprint cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "keyMaterial"));
                                  
                                         if (localKeyMaterial != null){
@@ -676,7 +660,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -695,7 +679,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","keyName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","keyName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -714,7 +698,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","keyFingerprint").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","keyFingerprint").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -733,7 +717,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","keyMaterial").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","keyMaterial").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairType.java b/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
index 6aec621..279c8c9 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateKeyPairType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateKeyPairType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateKeyPairType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "keyName"));
                                  
                                         if (localKeyName != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","keyName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","keyName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java b/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
new file mode 100644
index 0000000..95afd51
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateNetworkAcl.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkAcl bean class
+            */
+        
+        public  class CreateNetworkAcl
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateNetworkAcl",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateNetworkAcl
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateNetworkAclType localCreateNetworkAcl ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateNetworkAclType
+                           */
+                           public  com.amazon.ec2.CreateNetworkAclType getCreateNetworkAcl(){
+                               return localCreateNetworkAcl;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateNetworkAcl
+                               */
+                               public void setCreateNetworkAcl(com.amazon.ec2.CreateNetworkAclType param){
+                            
+                                            this.localCreateNetworkAcl=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkAcl.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateNetworkAcl==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateNetworkAcl.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateNetworkAcl.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkAcl parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkAcl object =
+                new CreateNetworkAcl();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateNetworkAcl").equals(reader.getName())){
+                                
+                                                object.setCreateNetworkAcl(com.amazon.ec2.CreateNetworkAclType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[12/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
new file mode 100644
index 0000000..c7f2674
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
@@ -0,0 +1,483 @@
+
+/**
+ * DeleteInternetGatewayType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteInternetGatewayType bean class
+            */
+        
+        public  class DeleteInternetGatewayType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteInternetGatewayType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for InternetGatewayId
+                        */
+
+                        
+                                    protected java.lang.String localInternetGatewayId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getInternetGatewayId(){
+                               return localInternetGatewayId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param InternetGatewayId
+                               */
+                               public void setInternetGatewayId(java.lang.String param){
+                            
+                                            this.localInternetGatewayId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteInternetGatewayType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteInternetGatewayType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteInternetGatewayType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"internetGatewayId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"internetGatewayId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("internetGatewayId");
+                                    }
+                                
+
+                                          if (localInternetGatewayId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("internetGatewayId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localInternetGatewayId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "internetGatewayId"));
+                                 
+                                        if (localInternetGatewayId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localInternetGatewayId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("internetGatewayId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteInternetGatewayType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteInternetGatewayType object =
+                new DeleteInternetGatewayType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteInternetGatewayType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteInternetGatewayType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","internetGatewayId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setInternetGatewayId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPair.java b/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
index f5da3d6..47cbdb2 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteKeyPair.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteKeyPair",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteKeyPair").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteKeyPair").equals(reader.getName())){
                                 
                                                 object.setDeleteKeyPair(com.amazon.ec2.DeleteKeyPairType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
index 814f98e..878cdf8 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteKeyPairResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteKeyPairResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteKeyPairResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteKeyPairResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteKeyPairResponse(com.amazon.ec2.DeleteKeyPairResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
index d0f57e1..d30de80 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteKeyPairResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteKeyPairResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteKeyPairResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
index 2e8dd70..3ea154a 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteKeyPairType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteKeyPairType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteKeyPairType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "keyName"));
                                  
                                         if (localKeyName != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","keyName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","keyName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
new file mode 100644
index 0000000..bd0bd1e
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteNetworkAcl.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkAcl bean class
+            */
+        
+        public  class DeleteNetworkAcl
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteNetworkAcl",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteNetworkAcl
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteNetworkAclType localDeleteNetworkAcl ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteNetworkAclType
+                           */
+                           public  com.amazon.ec2.DeleteNetworkAclType getDeleteNetworkAcl(){
+                               return localDeleteNetworkAcl;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteNetworkAcl
+                               */
+                               public void setDeleteNetworkAcl(com.amazon.ec2.DeleteNetworkAclType param){
+                            
+                                            this.localDeleteNetworkAcl=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkAcl.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteNetworkAcl==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteNetworkAcl.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteNetworkAcl.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkAcl parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkAcl object =
+                new DeleteNetworkAcl();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteNetworkAcl").equals(reader.getName())){
+                                
+                                                object.setDeleteNetworkAcl(com.amazon.ec2.DeleteNetworkAclType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
new file mode 100644
index 0000000..cff3ebb
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteNetworkAclEntry.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkAclEntry bean class
+            */
+        
+        public  class DeleteNetworkAclEntry
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteNetworkAclEntry",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteNetworkAclEntry
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteNetworkAclEntryType localDeleteNetworkAclEntry ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteNetworkAclEntryType
+                           */
+                           public  com.amazon.ec2.DeleteNetworkAclEntryType getDeleteNetworkAclEntry(){
+                               return localDeleteNetworkAclEntry;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteNetworkAclEntry
+                               */
+                               public void setDeleteNetworkAclEntry(com.amazon.ec2.DeleteNetworkAclEntryType param){
+                            
+                                            this.localDeleteNetworkAclEntry=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkAclEntry.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteNetworkAclEntry==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteNetworkAclEntry.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteNetworkAclEntry.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkAclEntry parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkAclEntry object =
+                new DeleteNetworkAclEntry();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteNetworkAclEntry").equals(reader.getName())){
+                                
+                                                object.setDeleteNetworkAclEntry(com.amazon.ec2.DeleteNetworkAclEntryType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
new file mode 100644
index 0000000..8058e42
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteNetworkAclEntryResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkAclEntryResponse bean class
+            */
+        
+        public  class DeleteNetworkAclEntryResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteNetworkAclEntryResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteNetworkAclEntryResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteNetworkAclEntryResponseType localDeleteNetworkAclEntryResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteNetworkAclEntryResponseType
+                           */
+                           public  com.amazon.ec2.DeleteNetworkAclEntryResponseType getDeleteNetworkAclEntryResponse(){
+                               return localDeleteNetworkAclEntryResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteNetworkAclEntryResponse
+                               */
+                               public void setDeleteNetworkAclEntryResponse(com.amazon.ec2.DeleteNetworkAclEntryResponseType param){
+                            
+                                            this.localDeleteNetworkAclEntryResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkAclEntryResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteNetworkAclEntryResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteNetworkAclEntryResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteNetworkAclEntryResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkAclEntryResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkAclEntryResponse object =
+                new DeleteNetworkAclEntryResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteNetworkAclEntryResponse").equals(reader.getName())){
+                                
+                                                object.setDeleteNetworkAclEntryResponse(com.amazon.ec2.DeleteNetworkAclEntryResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[18/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
index 4f614e1..474024e 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSecurityGroupResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateSecurityGroupResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateSecurityGroupResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateSecurityGroupResponse").equals(reader.getName())){
                                 
                                                 object.setCreateSecurityGroupResponse(com.amazon.ec2.CreateSecurityGroupResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
index b90f253..260da9d 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSecurityGroupResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateSecurityGroupResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -107,6 +91,36 @@
                                }
                             
 
+                        /**
+                        * field for GroupId
+                        */
+
+                        
+                                    protected java.lang.String localGroupId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getGroupId(){
+                               return localGroupId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param GroupId
+                               */
+                               public void setGroupId(java.lang.String param){
+                            
+                                            this.localGroupId=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -190,7 +204,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateSecurityGroupResponseType",
@@ -204,7 +218,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +252,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -267,6 +281,40 @@
                                     
                                    xmlWriter.writeEndElement();
                              
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"groupId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"groupId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("groupId");
+                                    }
+                                
+
+                                          if (localGroupId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("groupId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localGroupId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
                     xmlWriter.writeEndElement();
                
 
@@ -429,7 +477,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,12 +486,21 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
                             
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "groupId"));
+                                 
+                                        if (localGroupId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localGroupId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("groupId cannot be null!!");
+                                        }
+                                    
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -522,7 +579,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +598,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -556,6 +613,25 @@
                                     // A start element we are not expecting indicates an invalid parameter was passed
                                     throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
                                 }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setGroupId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
                               
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
index 699b483..0483a91 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSecurityGroupType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateSecurityGroupType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -107,6 +91,50 @@
                                }
                             
 
+                        /**
+                        * field for VpcId
+                        */
+
+                        
+                                    protected java.lang.String localVpcId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localVpcIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getVpcId(){
+                               return localVpcId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param VpcId
+                               */
+                               public void setVpcId(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localVpcIdTracker = true;
+                                       } else {
+                                          localVpcIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localVpcId=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -190,7 +218,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateSecurityGroupType",
@@ -204,7 +232,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +266,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -271,7 +299,41 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             
+                              if (localVpcIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"vpcId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"vpcId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("vpcId");
+                                    }
+                                
+
+                                          if (localVpcId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("vpcId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localVpcId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
                     xmlWriter.writeEndElement();
                
 
@@ -434,7 +496,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "groupName"));
                                  
                                         if (localGroupName != null){
@@ -443,7 +505,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("groupName cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "groupDescription"));
                                  
                                         if (localGroupDescription != null){
@@ -451,7 +513,16 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("groupDescription cannot be null!!");
                                         }
-                                    
+                                     if (localVpcIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "vpcId"));
+                                 
+                                        if (localVpcId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVpcId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("vpcId cannot be null!!");
+                                        }
+                                    }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -530,7 +601,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","groupName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +620,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","groupDescription").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupDescription").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -564,7 +635,25 @@
                                     // A start element we are not expecting indicates an invalid parameter was passed
                                     throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
                                 }
-                              
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpcId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setVpcId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                  
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();
                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSnapshot.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshot.java b/awsapi/src/com/amazon/ec2/CreateSnapshot.java
index addfd50..ab586fa 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshot.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshot.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSnapshot.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateSnapshot",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateSnapshot").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateSnapshot").equals(reader.getName())){
                                 
                                                 object.setCreateSnapshot(com.amazon.ec2.CreateSnapshotType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java b/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
index 33c1c70..6a79fc3 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSnapshotResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateSnapshotResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateSnapshotResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateSnapshotResponse").equals(reader.getName())){
                                 
                                                 object.setCreateSnapshotResponse(com.amazon.ec2.CreateSnapshotResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java b/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
index 8e053aa..9db0e79 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSnapshotResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateSnapshotResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -414,7 +398,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateSnapshotResponseType",
@@ -428,7 +412,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -462,7 +446,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -496,7 +480,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -530,7 +514,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -564,7 +548,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -598,7 +582,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -632,7 +616,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -666,7 +650,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -700,7 +684,7 @@
                                     
                                    xmlWriter.writeEndElement();
                               if (localDescriptionTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -896,7 +880,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -905,7 +889,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "snapshotId"));
                                  
                                         if (localSnapshotId != null){
@@ -914,7 +898,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("snapshotId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "volumeId"));
                                  
                                         if (localVolumeId != null){
@@ -923,7 +907,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "status"));
                                  
                                         if (localStatus != null){
@@ -932,7 +916,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "startTime"));
                                  
                                         if (localStartTime != null){
@@ -941,7 +925,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("startTime cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "progress"));
                                  
                                         if (localProgress != null){
@@ -950,7 +934,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("progress cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "ownerId"));
                                  
                                         if (localOwnerId != null){
@@ -959,7 +943,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("ownerId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "volumeSize"));
                                  
                                         if (localVolumeSize != null){
@@ -968,7 +952,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("volumeSize cannot be null!!");
                                         }
                                      if (localDescriptionTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "description"));
                                  
                                         if (localDescription != null){
@@ -1055,7 +1039,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1074,7 +1058,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","snapshotId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","snapshotId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1093,7 +1077,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","volumeId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","volumeId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1112,7 +1096,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","status").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","status").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1131,7 +1115,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","startTime").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","startTime").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1150,7 +1134,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","progress").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","progress").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1169,7 +1153,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ownerId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ownerId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1188,7 +1172,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","volumeSize").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","volumeSize").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1207,7 +1191,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","description").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","description").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotType.java b/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
index 531d773..fe9867c 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSnapshotType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateSnapshotType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -204,7 +188,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateSnapshotType",
@@ -218,7 +202,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -252,7 +236,7 @@
                                     
                                    xmlWriter.writeEndElement();
                               if (localDescriptionTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -448,7 +432,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "volumeId"));
                                  
                                         if (localVolumeId != null){
@@ -457,7 +441,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
                                         }
                                      if (localDescriptionTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "description"));
                                  
                                         if (localDescription != null){
@@ -544,7 +528,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","volumeId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","volumeId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -563,7 +547,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","description").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","description").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
index 5f8f51c..59de481 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSpotDatafeedSubscription.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateSpotDatafeedSubscription",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateSpotDatafeedSubscription").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateSpotDatafeedSubscription").equals(reader.getName())){
                                 
                                                 object.setCreateSpotDatafeedSubscription(com.amazon.ec2.CreateSpotDatafeedSubscriptionType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
index 94050e7..b3aaf7d 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSpotDatafeedSubscriptionResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateSpotDatafeedSubscriptionResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateSpotDatafeedSubscriptionResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateSpotDatafeedSubscriptionResponse").equals(reader.getName())){
                                 
                                                 object.setCreateSpotDatafeedSubscriptionResponse(com.amazon.ec2.CreateSpotDatafeedSubscriptionResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
index dfe67d2..26e2048 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSpotDatafeedSubscriptionResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateSpotDatafeedSubscriptionResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateSpotDatafeedSubscriptionResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localSpotDatafeedSubscription==null){
                                                  throw new org.apache.axis2.databinding.ADBException("spotDatafeedSubscription cannot be null!!");
                                             }
-                                           localSpotDatafeedSubscription.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","spotDatafeedSubscription"),
+                                           localSpotDatafeedSubscription.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","spotDatafeedSubscription"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "spotDatafeedSubscription"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","spotDatafeedSubscription").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","spotDatafeedSubscription").equals(reader.getName())){
                                 
                                                 object.setSpotDatafeedSubscription(com.amazon.ec2.SpotDatafeedSubscriptionType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
index 700b2ee..01adf95 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSpotDatafeedSubscriptionType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateSpotDatafeedSubscriptionType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateSpotDatafeedSubscriptionType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -434,7 +418,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bucket"));
                                  
                                         if (localBucket != null){
@@ -443,7 +427,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("bucket cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "prefix"));
                                  
                                         if (localPrefix != null){
@@ -530,7 +514,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bucket").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bucket").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +533,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","prefix").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","prefix").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSubnet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnet.java b/awsapi/src/com/amazon/ec2/CreateSubnet.java
index 0cafab0..065a2fb 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnet.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnet.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSubnet.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateSubnet",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateSubnet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateSubnet").equals(reader.getName())){
                                 
                                                 object.setCreateSubnet(com.amazon.ec2.CreateSubnetType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java b/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
index e5935ea..e49e304 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSubnetResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateSubnetResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateSubnetResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateSubnetResponse").equals(reader.getName())){
                                 
                                                 object.setCreateSubnetResponse(com.amazon.ec2.CreateSubnetResponseType.Factory.parse(reader));
                                             


[03/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
index 9c34ef3..cb01b15 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpnGatewayType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteVpnGatewayType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteVpnGatewayType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpnGatewayId"));
                                  
                                         if (localVpnGatewayId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpnGatewayId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpnGatewayId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeregisterImage.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImage.java b/awsapi/src/com/amazon/ec2/DeregisterImage.java
index 8fe503a..7703850 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImage.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImage.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeregisterImage.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeregisterImage",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeregisterImage").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeregisterImage").equals(reader.getName())){
                                 
                                                 object.setDeregisterImage(com.amazon.ec2.DeregisterImageType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java b/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
index e268534..1d4485a 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeregisterImageResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeregisterImageResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeregisterImageResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeregisterImageResponse").equals(reader.getName())){
                                 
                                                 object.setDeregisterImageResponse(com.amazon.ec2.DeregisterImageResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java b/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
index aa0dc22..0b94889 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeregisterImageResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeregisterImageResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeregisterImageResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeregisterImageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageType.java b/awsapi/src/com/amazon/ec2/DeregisterImageType.java
index 65c446c..cd1eae9 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImageType.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImageType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeregisterImageType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeregisterImageType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeregisterImageType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "imageId"));
                                  
                                         if (localImageId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","imageId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","imageId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAddresses.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddresses.java b/awsapi/src/com/amazon/ec2/DescribeAddresses.java
index 129a510..08b8614 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddresses.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddresses.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAddresses.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DescribeAddresses",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DescribeAddresses").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DescribeAddresses").equals(reader.getName())){
                                 
                                                 object.setDescribeAddresses(com.amazon.ec2.DescribeAddressesType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
index f552827..8272ce4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAddressesInfoType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeAddressesInfoType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeAddressesInfoType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.DescribeAddressesItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
index 474c28e..66823f7 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAddressesItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeAddressesItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeAddressesItemType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "publicIp"));
                                  
                                         if (localPublicIp != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","publicIp").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","publicIp").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
index a135aba..d6ef99c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAddressesResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DescribeAddressesResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DescribeAddressesResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DescribeAddressesResponse").equals(reader.getName())){
                                 
                                                 object.setDescribeAddressesResponse(com.amazon.ec2.DescribeAddressesResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
index 2ab759b..ca53f8e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAddressesResponseInfoType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeAddressesResponseInfoType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeAddressesResponseInfoType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.DescribeAddressesResponseItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
index 74ef850..367fe82 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAddressesResponseItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeAddressesResponseItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -78,6 +62,80 @@
                             
 
                         /**
+                        * field for AllocationId
+                        */
+
+                        
+                                    protected java.lang.String localAllocationId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localAllocationIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getAllocationId(){
+                               return localAllocationId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AllocationId
+                               */
+                               public void setAllocationId(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localAllocationIdTracker = true;
+                                       } else {
+                                          localAllocationIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localAllocationId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for Domain
+                        */
+
+                        
+                                    protected java.lang.String localDomain ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getDomain(){
+                               return localDomain;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Domain
+                               */
+                               public void setDomain(java.lang.String param){
+                            
+                                            this.localDomain=param;
+                                    
+
+                               }
+                            
+
+                        /**
                         * field for InstanceId
                         */
 
@@ -121,6 +179,182 @@
                                }
                             
 
+                        /**
+                        * field for AssociationId
+                        */
+
+                        
+                                    protected java.lang.String localAssociationId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localAssociationIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getAssociationId(){
+                               return localAssociationId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AssociationId
+                               */
+                               public void setAssociationId(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localAssociationIdTracker = true;
+                                       } else {
+                                          localAssociationIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localAssociationId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for NetworkInterfaceId
+                        */
+
+                        
+                                    protected java.lang.String localNetworkInterfaceId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localNetworkInterfaceIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getNetworkInterfaceId(){
+                               return localNetworkInterfaceId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkInterfaceId
+                               */
+                               public void setNetworkInterfaceId(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localNetworkInterfaceIdTracker = true;
+                                       } else {
+                                          localNetworkInterfaceIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localNetworkInterfaceId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for NetworkInterfaceOwnerId
+                        */
+
+                        
+                                    protected java.lang.String localNetworkInterfaceOwnerId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localNetworkInterfaceOwnerIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getNetworkInterfaceOwnerId(){
+                               return localNetworkInterfaceOwnerId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkInterfaceOwnerId
+                               */
+                               public void setNetworkInterfaceOwnerId(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localNetworkInterfaceOwnerIdTracker = true;
+                                       } else {
+                                          localNetworkInterfaceOwnerIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localNetworkInterfaceOwnerId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for PrivateIpAddress
+                        */
+
+                        
+                                    protected java.lang.String localPrivateIpAddress ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localPrivateIpAddressTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getPrivateIpAddress(){
+                               return localPrivateIpAddress;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param PrivateIpAddress
+                               */
+                               public void setPrivateIpAddress(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localPrivateIpAddressTracker = true;
+                                       } else {
+                                          localPrivateIpAddressTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localPrivateIpAddress=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -204,7 +438,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeAddressesResponseItemType",
@@ -218,7 +452,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -251,8 +485,76 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
+                              if (localAllocationIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"allocationId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"allocationId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("allocationId");
+                                    }
+                                
+
+                                          if (localAllocationId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("allocationId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localAllocationId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"domain", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"domain");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("domain");
+                                    }
+                                
+
+                                          if (localDomain==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("domain cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localDomain);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
                               if (localInstanceIdTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -285,6 +587,142 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
+                             } if (localAssociationIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"associationId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"associationId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("associationId");
+                                    }
+                                
+
+                                          if (localAssociationId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("associationId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localAssociationId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localNetworkInterfaceIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"networkInterfaceId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"networkInterfaceId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("networkInterfaceId");
+                                    }
+                                
+
+                                          if (localNetworkInterfaceId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localNetworkInterfaceId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localNetworkInterfaceOwnerIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"networkInterfaceOwnerId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"networkInterfaceOwnerId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("networkInterfaceOwnerId");
+                                    }
+                                
+
+                                          if (localNetworkInterfaceOwnerId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("networkInterfaceOwnerId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localNetworkInterfaceOwnerId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localPrivateIpAddressTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"privateIpAddress", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"privateIpAddress");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("privateIpAddress");
+                                    }
+                                
+
+                                          if (localPrivateIpAddress==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("privateIpAddress cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localPrivateIpAddress);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
                              }
                     xmlWriter.writeEndElement();
                
@@ -448,7 +886,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "publicIp"));
                                  
                                         if (localPublicIp != null){
@@ -456,8 +894,26 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("publicIp cannot be null!!");
                                         }
+                                     if (localAllocationIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "allocationId"));
+                                 
+                                        if (localAllocationId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAllocationId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("allocationId cannot be null!!");
+                                        }
+                                    }
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "domain"));
+                                 
+                                        if (localDomain != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDomain));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("domain cannot be null!!");
+                                        }
                                      if (localInstanceIdTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "instanceId"));
                                  
                                         if (localInstanceId != null){
@@ -465,6 +921,42 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
                                         }
+                                    } if (localAssociationIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "associationId"));
+                                 
+                                        if (localAssociationId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAssociationId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("associationId cannot be null!!");
+                                        }
+                                    } if (localNetworkInterfaceIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkInterfaceId"));
+                                 
+                                        if (localNetworkInterfaceId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNetworkInterfaceId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                        }
+                                    } if (localNetworkInterfaceOwnerIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkInterfaceOwnerId"));
+                                 
+                                        if (localNetworkInterfaceOwnerId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNetworkInterfaceOwnerId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("networkInterfaceOwnerId cannot be null!!");
+                                        }
+                                    } if (localPrivateIpAddressTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "privateIpAddress"));
+                                 
+                                        if (localPrivateIpAddress != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPrivateIpAddress));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("privateIpAddress cannot be null!!");
+                                        }
                                     }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
@@ -544,7 +1036,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","publicIp").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","publicIp").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -563,7 +1055,44 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","instanceId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","allocationId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setAllocationId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","domain").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setDomain(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -577,6 +1106,78 @@
                                     else {
                                         
                                     }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","associationId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setAssociationId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkInterfaceId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setNetworkInterfaceId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkInterfaceOwnerId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setNetworkInterfaceOwnerId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","privateIpAddress").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setPrivateIpAddress(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
                                   
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();


[41/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
index a2d95d0..da7d483 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AssociateDhcpOptionsResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AssociateDhcpOptionsResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AssociateDhcpOptionsResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
index 4fa96ab..0b45971 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AssociateDhcpOptionsType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AssociateDhcpOptionsType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AssociateDhcpOptionsType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -434,7 +418,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "dhcpOptionsId"));
                                  
                                         if (localDhcpOptionsId != null){
@@ -443,7 +427,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("dhcpOptionsId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpcId"));
                                  
                                         if (localVpcId != null){
@@ -530,7 +514,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","dhcpOptionsId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","dhcpOptionsId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +533,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpcId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpcId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTable.java b/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
new file mode 100644
index 0000000..c93393a
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
@@ -0,0 +1,362 @@
+
+/**
+ * AssociateRouteTable.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssociateRouteTable bean class
+            */
+        
+        public  class AssociateRouteTable
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "AssociateRouteTable",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AssociateRouteTable
+                        */
+
+                        
+                                    protected com.amazon.ec2.AssociateRouteTableType localAssociateRouteTable ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AssociateRouteTableType
+                           */
+                           public  com.amazon.ec2.AssociateRouteTableType getAssociateRouteTable(){
+                               return localAssociateRouteTable;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AssociateRouteTable
+                               */
+                               public void setAssociateRouteTable(com.amazon.ec2.AssociateRouteTableType param){
+                            
+                                            this.localAssociateRouteTable=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssociateRouteTable.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localAssociateRouteTable==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localAssociateRouteTable.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localAssociateRouteTable.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssociateRouteTable parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssociateRouteTable object =
+                new AssociateRouteTable();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AssociateRouteTable").equals(reader.getName())){
+                                
+                                                object.setAssociateRouteTable(com.amazon.ec2.AssociateRouteTableType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
new file mode 100644
index 0000000..dd71521
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * AssociateRouteTableResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssociateRouteTableResponse bean class
+            */
+        
+        public  class AssociateRouteTableResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "AssociateRouteTableResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AssociateRouteTableResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.AssociateRouteTableResponseType localAssociateRouteTableResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AssociateRouteTableResponseType
+                           */
+                           public  com.amazon.ec2.AssociateRouteTableResponseType getAssociateRouteTableResponse(){
+                               return localAssociateRouteTableResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AssociateRouteTableResponse
+                               */
+                               public void setAssociateRouteTableResponse(com.amazon.ec2.AssociateRouteTableResponseType param){
+                            
+                                            this.localAssociateRouteTableResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssociateRouteTableResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localAssociateRouteTableResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localAssociateRouteTableResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localAssociateRouteTableResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssociateRouteTableResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssociateRouteTableResponse object =
+                new AssociateRouteTableResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AssociateRouteTableResponse").equals(reader.getName())){
+                                
+                                                object.setAssociateRouteTableResponse(com.amazon.ec2.AssociateRouteTableResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
new file mode 100644
index 0000000..cd57ebf
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
@@ -0,0 +1,575 @@
+
+/**
+ * AssociateRouteTableResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssociateRouteTableResponseType bean class
+            */
+        
+        public  class AssociateRouteTableResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AssociateRouteTableResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for AssociationId
+                        */
+
+                        
+                                    protected java.lang.String localAssociationId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getAssociationId(){
+                               return localAssociationId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AssociationId
+                               */
+                               public void setAssociationId(java.lang.String param){
+                            
+                                            this.localAssociationId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssociateRouteTableResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AssociateRouteTableResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AssociateRouteTableResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"associationId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"associationId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("associationId");
+                                    }
+                                
+
+                                          if (localAssociationId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("associationId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localAssociationId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "associationId"));
+                                 
+                                        if (localAssociationId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAssociationId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("associationId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssociateRouteTableResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssociateRouteTableResponseType object =
+                new AssociateRouteTableResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AssociateRouteTableResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AssociateRouteTableResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","associationId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setAssociationId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[38/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
new file mode 100644
index 0000000..81d0ed2
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
@@ -0,0 +1,659 @@
+
+/**
+ * AttachNetworkInterfaceType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AttachNetworkInterfaceType bean class
+            */
+        
+        public  class AttachNetworkInterfaceType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AttachNetworkInterfaceType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for NetworkInterfaceId
+                        */
+
+                        
+                                    protected java.lang.String localNetworkInterfaceId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getNetworkInterfaceId(){
+                               return localNetworkInterfaceId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkInterfaceId
+                               */
+                               public void setNetworkInterfaceId(java.lang.String param){
+                            
+                                            this.localNetworkInterfaceId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for InstanceId
+                        */
+
+                        
+                                    protected java.lang.String localInstanceId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getInstanceId(){
+                               return localInstanceId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param InstanceId
+                               */
+                               public void setInstanceId(java.lang.String param){
+                            
+                                            this.localInstanceId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for DeviceIndex
+                        */
+
+                        
+                                    protected int localDeviceIndex ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return int
+                           */
+                           public  int getDeviceIndex(){
+                               return localDeviceIndex;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeviceIndex
+                               */
+                               public void setDeviceIndex(int param){
+                            
+                                            this.localDeviceIndex=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AttachNetworkInterfaceType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AttachNetworkInterfaceType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AttachNetworkInterfaceType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"networkInterfaceId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"networkInterfaceId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("networkInterfaceId");
+                                    }
+                                
+
+                                          if (localNetworkInterfaceId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localNetworkInterfaceId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"instanceId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"instanceId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("instanceId");
+                                    }
+                                
+
+                                          if (localInstanceId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localInstanceId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"deviceIndex", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"deviceIndex");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("deviceIndex");
+                                    }
+                                
+                                               if (localDeviceIndex==java.lang.Integer.MIN_VALUE) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("deviceIndex cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDeviceIndex));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkInterfaceId"));
+                                 
+                                        if (localNetworkInterfaceId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNetworkInterfaceId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "instanceId"));
+                                 
+                                        if (localInstanceId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localInstanceId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "deviceIndex"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDeviceIndex));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AttachNetworkInterfaceType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AttachNetworkInterfaceType object =
+                new AttachNetworkInterfaceType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AttachNetworkInterfaceType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AttachNetworkInterfaceType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkInterfaceId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setNetworkInterfaceId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setInstanceId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","deviceIndex").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setDeviceIndex(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToInt(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolume.java b/awsapi/src/com/amazon/ec2/AttachVolume.java
index b94f37b..2e9b8f3 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolume.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolume.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachVolume.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AttachVolume",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AttachVolume").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AttachVolume").equals(reader.getName())){
                                 
                                                 object.setAttachVolume(com.amazon.ec2.AttachVolumeType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java b/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
index 00be7f2..46399ea 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachVolumeResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AttachVolumeResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AttachVolumeResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AttachVolumeResponse").equals(reader.getName())){
                                 
                                                 object.setAttachVolumeResponse(com.amazon.ec2.AttachVolumeResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java b/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
index 4fd99e2..aa4206a 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachVolumeResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AttachVolumeResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -310,7 +294,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AttachVolumeResponseType",
@@ -324,7 +308,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -358,7 +342,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -392,7 +376,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -426,7 +410,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -460,7 +444,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -494,7 +478,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -690,7 +674,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -699,7 +683,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "volumeId"));
                                  
                                         if (localVolumeId != null){
@@ -708,7 +692,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "instanceId"));
                                  
                                         if (localInstanceId != null){
@@ -717,7 +701,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "device"));
                                  
                                         if (localDevice != null){
@@ -726,7 +710,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("device cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "status"));
                                  
                                         if (localStatus != null){
@@ -735,7 +719,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "attachTime"));
                                  
                                         if (localAttachTime != null){
@@ -822,7 +806,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -841,7 +825,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","volumeId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","volumeId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -860,7 +844,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","instanceId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -879,7 +863,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","device").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","device").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -898,7 +882,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","status").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","status").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -917,7 +901,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","attachTime").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","attachTime").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeType.java b/awsapi/src/com/amazon/ec2/AttachVolumeType.java
index 4d2b3d8..07ace9f 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolumeType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachVolumeType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AttachVolumeType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -220,7 +204,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AttachVolumeType",
@@ -234,7 +218,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -268,7 +252,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -302,7 +286,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -498,7 +482,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "volumeId"));
                                  
                                         if (localVolumeId != null){
@@ -507,7 +491,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "instanceId"));
                                  
                                         if (localInstanceId != null){
@@ -516,7 +500,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "device"));
                                  
                                         if (localDevice != null){
@@ -603,7 +587,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","volumeId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","volumeId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -622,7 +606,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","instanceId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -641,7 +625,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","device").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","device").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGateway.java b/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
index 61df233..89ec7a8 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachVpnGateway.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AttachVpnGateway",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AttachVpnGateway").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AttachVpnGateway").equals(reader.getName())){
                                 
                                                 object.setAttachVpnGateway(com.amazon.ec2.AttachVpnGatewayType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
index 6977363..c6bf0de 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachVpnGatewayResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AttachVpnGatewayResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AttachVpnGatewayResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AttachVpnGatewayResponse").equals(reader.getName())){
                                 
                                                 object.setAttachVpnGatewayResponse(com.amazon.ec2.AttachVpnGatewayResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
index 878c752..9cb8b2a 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachVpnGatewayResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AttachVpnGatewayResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AttachVpnGatewayResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localAttachment==null){
                                                  throw new org.apache.axis2.databinding.ADBException("attachment cannot be null!!");
                                             }
-                                           localAttachment.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","attachment"),
+                                           localAttachment.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","attachment"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "attachment"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","attachment").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","attachment").equals(reader.getName())){
                                 
                                                 object.setAttachment(com.amazon.ec2.AttachmentType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
index 768644e..af90c15 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachVpnGatewayType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AttachVpnGatewayType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AttachVpnGatewayType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -434,7 +418,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpnGatewayId"));
                                  
                                         if (localVpnGatewayId != null){
@@ -443,7 +427,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("vpnGatewayId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpcId"));
                                  
                                         if (localVpcId != null){
@@ -530,7 +514,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpnGatewayId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpnGatewayId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +533,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpcId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpcId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     


[49/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
index 5c0af5f..0c6103b 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ActivateLicenseResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "ActivateLicenseResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ActivateLicenseResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ActivateLicenseResponse").equals(reader.getName())){
                                 
                                                 object.setActivateLicenseResponse(com.amazon.ec2.ActivateLicenseResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
index e534e9a..e97f4c8 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ActivateLicenseResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = ActivateLicenseResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":ActivateLicenseResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
index 9965457..0e021b6 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ActivateLicenseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = ActivateLicenseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":ActivateLicenseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "licenseId"));
                                  
                                         if (localLicenseId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("licenseId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "capacity"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","licenseId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","licenseId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","capacity").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","capacity").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AllocateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddress.java b/awsapi/src/com/amazon/ec2/AllocateAddress.java
index 318b5cc..daf3fcd 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddress.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddress.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AllocateAddress.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AllocateAddress",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AllocateAddress").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AllocateAddress").equals(reader.getName())){
                                 
                                                 object.setAllocateAddress(com.amazon.ec2.AllocateAddressType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
index 0452850..f7abe48 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AllocateAddressResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AllocateAddressResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AllocateAddressResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AllocateAddressResponse").equals(reader.getName())){
                                 
                                                 object.setAllocateAddressResponse(com.amazon.ec2.AllocateAddressResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
index 5218e08..afe213d 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AllocateAddressResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AllocateAddressResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -107,6 +91,80 @@
                                }
                             
 
+                        /**
+                        * field for Domain
+                        */
+
+                        
+                                    protected java.lang.String localDomain ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getDomain(){
+                               return localDomain;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Domain
+                               */
+                               public void setDomain(java.lang.String param){
+                            
+                                            this.localDomain=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for AllocationId
+                        */
+
+                        
+                                    protected java.lang.String localAllocationId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localAllocationIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getAllocationId(){
+                               return localAllocationId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AllocationId
+                               */
+                               public void setAllocationId(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localAllocationIdTracker = true;
+                                       } else {
+                                          localAllocationIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localAllocationId=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -190,7 +248,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AllocateAddressResponseType",
@@ -204,7 +262,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +296,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -272,6 +330,74 @@
                                     
                                    xmlWriter.writeEndElement();
                              
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"domain", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"domain");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("domain");
+                                    }
+                                
+
+                                          if (localDomain==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("domain cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localDomain);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                              if (localAllocationIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"allocationId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"allocationId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("allocationId");
+                                    }
+                                
+
+                                          if (localAllocationId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("allocationId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localAllocationId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
                     xmlWriter.writeEndElement();
                
 
@@ -434,7 +560,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -443,7 +569,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "publicIp"));
                                  
                                         if (localPublicIp != null){
@@ -452,6 +578,24 @@
                                            throw new org.apache.axis2.databinding.ADBException("publicIp cannot be null!!");
                                         }
                                     
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "domain"));
+                                 
+                                        if (localDomain != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDomain));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("domain cannot be null!!");
+                                        }
+                                     if (localAllocationIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "allocationId"));
+                                 
+                                        if (localAllocationId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAllocationId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("allocationId cannot be null!!");
+                                        }
+                                    }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -530,7 +674,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +693,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","publicIp").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","publicIp").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -564,7 +708,44 @@
                                     // A start element we are not expecting indicates an invalid parameter was passed
                                     throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
                                 }
-                              
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","domain").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setDomain(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","allocationId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setAllocationId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                  
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();
                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AllocateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressType.java b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
index 2fb4fd9..5310992 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AllocateAddressType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AllocateAddressType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -47,6 +31,50 @@
 
         
 
+                        /**
+                        * field for Domain
+                        */
+
+                        
+                                    protected java.lang.String localDomain ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localDomainTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getDomain(){
+                               return localDomain;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Domain
+                               */
+                               public void setDomain(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localDomainTracker = true;
+                                       } else {
+                                          localDomainTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localDomain=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -130,7 +158,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AllocateAddressType",
@@ -143,7 +171,41 @@
 
                
                    }
-               
+                if (localDomainTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"domain", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"domain");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("domain");
+                                    }
+                                
+
+                                          if (localDomain==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("domain cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localDomain);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
                     xmlWriter.writeEndElement();
                
 
@@ -305,7 +367,16 @@
                  java.util.ArrayList elementList = new java.util.ArrayList();
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
-                
+                 if (localDomainTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "domain"));
+                                 
+                                        if (localDomain != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDomain));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("domain cannot be null!!");
+                                        }
+                                    }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -381,6 +452,31 @@
                     
                     reader.next();
                 
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","domain").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setDomain(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                  
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
 
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
new file mode 100644
index 0000000..744e128
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
@@ -0,0 +1,483 @@
+
+/**
+ * AllocationIdSetItemType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AllocationIdSetItemType bean class
+            */
+        
+        public  class AllocationIdSetItemType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AllocationIdSetItemType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AllocationId
+                        */
+
+                        
+                                    protected java.lang.String localAllocationId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getAllocationId(){
+                               return localAllocationId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AllocationId
+                               */
+                               public void setAllocationId(java.lang.String param){
+                            
+                                            this.localAllocationId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AllocationIdSetItemType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AllocationIdSetItemType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AllocationIdSetItemType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"allocationId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"allocationId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("allocationId");
+                                    }
+                                
+
+                                          if (localAllocationId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("allocationId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localAllocationId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "allocationId"));
+                                 
+                                        if (localAllocationId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAllocationId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("allocationId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AllocationIdSetItemType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AllocationIdSetItemType object =
+                new AllocationIdSetItemType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AllocationIdSetItemType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AllocationIdSetItemType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","allocationId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setAllocationId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[58/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java
index 7fac4a6..d4ba675 100644
--- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetInstanceAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java
index 100993e..5733123 100644
--- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetInstanceAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java
index f606841..fedac22 100644
--- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetInstanceAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java
index 7f0bb0f..7774ef8 100644
--- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetInstanceAttributesGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java
index 3472994..7fa719f 100644
--- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetNetworkInterfaceAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java
index 3cc7c1b..43b15c8 100644
--- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetNetworkInterfaceAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java
index bd68c4b..60fc516 100644
--- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetNetworkInterfaceAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java
index 7edd08a..b1a4224 100644
--- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetNetworkInterfaceAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java
index 22061ee..72838ba 100644
--- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetNetworkInterfaceAttributesGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java
index c6877bb..e056aeb 100644
--- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetSnapshotAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java
index 1d28254..80b8c64 100644
--- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetSnapshotAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java
index 7a637c1..cd4d425 100644
--- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetSnapshotAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java
index 3cddb35..7ecbba7 100644
--- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetSnapshotAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java
index a774bdd..9e2b107 100644
--- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetSnapshotAttributesGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java b/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java
index 3bdf8d1..dc24116 100644
--- a/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResourceIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResourceIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResourceIdSetType.java b/awsapi/src/com/amazon/ec2/ResourceIdSetType.java
index 3939bfd..a57bc6d 100644
--- a/awsapi/src/com/amazon/ec2/ResourceIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/ResourceIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResourceIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java b/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java
index 9f78bcf..c558b87 100644
--- a/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResourceTagSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResourceTagSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResourceTagSetType.java b/awsapi/src/com/amazon/ec2/ResourceTagSetType.java
index cfb9c36..e90d6d4 100644
--- a/awsapi/src/com/amazon/ec2/ResourceTagSetType.java
+++ b/awsapi/src/com/amazon/ec2/ResourceTagSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResourceTagSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java
index e44f576..fbbde4d 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RevokeSecurityGroupEgress.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java
index 55b5816..b844ba0 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RevokeSecurityGroupEgressResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java
index bb7d658..4ed80e5 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RevokeSecurityGroupEgressResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java
index 4291027..2ea106a 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RevokeSecurityGroupEgressType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java
index b269902..e0add05 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RevokeSecurityGroupIngress.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java
index 9d1effd..8eadc0a 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RevokeSecurityGroupIngressResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java
index b5933cc..28d862c 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RevokeSecurityGroupIngressResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java
index e4e7d83..5f6843d 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RevokeSecurityGroupIngressType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java
index e0c4504..84a8650 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RevokeSecurityGroupIngressTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RouteSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteSetType.java b/awsapi/src/com/amazon/ec2/RouteSetType.java
index 274ef71..e1fcd7f 100644
--- a/awsapi/src/com/amazon/ec2/RouteSetType.java
+++ b/awsapi/src/com/amazon/ec2/RouteSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RouteSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java b/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java
index 1672796..a9308ad 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RouteTableAssociationSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java b/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java
index d160535..4786f17 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RouteTableAssociationType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java
index ca90455..e491eb1 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RouteTableAssociationTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java b/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java
index bde34bf..8577055 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RouteTableIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java b/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java
index 3f33758..7b36f70 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RouteTableIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RouteTableSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableSetType.java b/awsapi/src/com/amazon/ec2/RouteTableSetType.java
index 60d6c97..1ff387c 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableSetType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RouteTableSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableType.java b/awsapi/src/com/amazon/ec2/RouteTableType.java
index 2b9a122..ae73b0e 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RouteTableType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteType.java b/awsapi/src/com/amazon/ec2/RouteType.java
index 2ac7e27..45be6d6 100644
--- a/awsapi/src/com/amazon/ec2/RouteType.java
+++ b/awsapi/src/com/amazon/ec2/RouteType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RouteType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RunInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunInstances.java b/awsapi/src/com/amazon/ec2/RunInstances.java
index b3dc415..d803eb9 100644
--- a/awsapi/src/com/amazon/ec2/RunInstances.java
+++ b/awsapi/src/com/amazon/ec2/RunInstances.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RunInstances.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RunInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunInstancesResponse.java b/awsapi/src/com/amazon/ec2/RunInstancesResponse.java
index 5079ad2..baf1de0 100644
--- a/awsapi/src/com/amazon/ec2/RunInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/RunInstancesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RunInstancesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java b/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java
index 51e5df0..e065f04 100644
--- a/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RunInstancesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RunInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunInstancesType.java b/awsapi/src/com/amazon/ec2/RunInstancesType.java
index a71d338..821a9cc 100644
--- a/awsapi/src/com/amazon/ec2/RunInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/RunInstancesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RunInstancesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java b/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java
index abc8cb0..176b3ce 100644
--- a/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java
+++ b/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RunningInstancesItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java b/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java
index 2874b78..bc844dd 100644
--- a/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java
+++ b/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RunningInstancesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java
index e535f3c..7693caa 100644
--- a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SecurityGroupIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java
index 717ebfc..0b72789 100644
--- a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SecurityGroupIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java b/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java
index 63e7c77..6f5eb4d 100644
--- a/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java
+++ b/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SecurityGroupItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java b/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java
index 1ea5f91..e2b84c6 100644
--- a/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java
+++ b/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SecurityGroupSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java
index 98ec941..73b898f 100644
--- a/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java
+++ b/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SpotDatafeedSubscriptionType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java
index eedc276..4fcadca 100644
--- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SpotInstanceRequestIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java
index c977da8..1d2b286 100644
--- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SpotInstanceRequestIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java
index a923869..7a5353a 100644
--- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SpotInstanceRequestSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java
index 8a0836a..fcf61bc 100644
--- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java
+++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SpotInstanceRequestSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java b/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java
index a172c9c..2c6b811 100644
--- a/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java
+++ b/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SpotInstanceStateFaultType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java b/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java
index 7d73842..b5236fd 100644
--- a/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java
+++ b/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SpotPlacementRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java
index 3f4339c..88d14c1 100644
--- a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java
+++ b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SpotPriceHistorySetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java
index ecb07f8..57bde79 100644
--- a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java
+++ b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SpotPriceHistorySetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/StartInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StartInstances.java b/awsapi/src/com/amazon/ec2/StartInstances.java
index da9db2b..ef0e589 100644
--- a/awsapi/src/com/amazon/ec2/StartInstances.java
+++ b/awsapi/src/com/amazon/ec2/StartInstances.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * StartInstances.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/StartInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StartInstancesResponse.java b/awsapi/src/com/amazon/ec2/StartInstancesResponse.java
index ee5ae1a..34877ef 100644
--- a/awsapi/src/com/amazon/ec2/StartInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/StartInstancesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * StartInstancesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java b/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java
index 5f3d311..95e4cc9 100644
--- a/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * StartInstancesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/StartInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StartInstancesType.java b/awsapi/src/com/amazon/ec2/StartInstancesType.java
index 2c7bcaa..15d4dd5 100644
--- a/awsapi/src/com/amazon/ec2/StartInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/StartInstancesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * StartInstancesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/StateReasonType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StateReasonType.java b/awsapi/src/com/amazon/ec2/StateReasonType.java
index 5137633..796a11b 100644
--- a/awsapi/src/com/amazon/ec2/StateReasonType.java
+++ b/awsapi/src/com/amazon/ec2/StateReasonType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * StateReasonType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/StopInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StopInstances.java b/awsapi/src/com/amazon/ec2/StopInstances.java
index 35d5492..6a3b301 100644
--- a/awsapi/src/com/amazon/ec2/StopInstances.java
+++ b/awsapi/src/com/amazon/ec2/StopInstances.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * StopInstances.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/StopInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StopInstancesResponse.java b/awsapi/src/com/amazon/ec2/StopInstancesResponse.java
index c0261bc..1f6af68 100644
--- a/awsapi/src/com/amazon/ec2/StopInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/StopInstancesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * StopInstancesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java b/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java
index 8c9d806..2434182 100644
--- a/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * StopInstancesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/StopInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StopInstancesType.java b/awsapi/src/com/amazon/ec2/StopInstancesType.java
index 60327d8..de9a3a7 100644
--- a/awsapi/src/com/amazon/ec2/StopInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/StopInstancesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * StopInstancesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java b/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java
index 4f73b67..ba3af17 100644
--- a/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SubnetIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SubnetIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SubnetIdSetType.java b/awsapi/src/com/amazon/ec2/SubnetIdSetType.java
index de1b2e0..e396c0d 100644
--- a/awsapi/src/com/amazon/ec2/SubnetIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/SubnetIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SubnetIdSetType.java


[37/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java b/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
index d1f258f..96bda4f 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachmentSetItemResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AttachmentSetItemResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -310,7 +294,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AttachmentSetItemResponseType",
@@ -324,7 +308,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -358,7 +342,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -392,7 +376,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -426,7 +410,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -460,7 +444,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -494,7 +478,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -685,7 +669,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "volumeId"));
                                  
                                         if (localVolumeId != null){
@@ -694,7 +678,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "instanceId"));
                                  
                                         if (localInstanceId != null){
@@ -703,7 +687,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "device"));
                                  
                                         if (localDevice != null){
@@ -712,7 +696,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("device cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "status"));
                                  
                                         if (localStatus != null){
@@ -721,7 +705,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "attachTime"));
                                  
                                         if (localAttachTime != null){
@@ -730,7 +714,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("attachTime cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "deleteOnTermination"));
                                  
                                 elementList.add(
@@ -814,7 +798,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","volumeId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","volumeId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -833,7 +817,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","instanceId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -852,7 +836,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","device").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","device").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -871,7 +855,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","status").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","status").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -890,7 +874,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","attachTime").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","attachTime").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -909,7 +893,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","deleteOnTermination").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","deleteOnTermination").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java b/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
index b0a5148..cb92e59 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachmentSetResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AttachmentSetResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AttachmentSetResponseType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.AttachmentSetItemResponseType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachmentSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetType.java b/awsapi/src/com/amazon/ec2/AttachmentSetType.java
index d8a593a..a8dbda3 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentSetType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentSetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachmentSetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AttachmentSetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AttachmentSetType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.AttachmentType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentType.java b/awsapi/src/com/amazon/ec2/AttachmentType.java
index 68380a9..592ae06 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttachmentType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AttachmentType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AttachmentType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -434,7 +418,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpcId"));
                                  
                                         if (localVpcId != null){
@@ -443,7 +427,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("vpcId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "state"));
                                  
                                         if (localState != null){
@@ -530,7 +514,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpcId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpcId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +533,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","state").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","state").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java b/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
index 2def712..7fc0c6b 100644
--- a/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
+++ b/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttributeBooleanValueType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AttributeBooleanValueType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AttributeBooleanValueType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -365,7 +349,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "value"));
                                  
                                 elementList.add(
@@ -449,7 +433,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","value").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","value").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttributeValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttributeValueType.java b/awsapi/src/com/amazon/ec2/AttributeValueType.java
index 5f1d5b1..3c36a60 100644
--- a/awsapi/src/com/amazon/ec2/AttributeValueType.java
+++ b/awsapi/src/com/amazon/ec2/AttributeValueType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AttributeValueType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AttributeValueType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AttributeValueType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "value"));
                                  
                                         if (localValue != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","value").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","value").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
new file mode 100644
index 0000000..199a945
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
@@ -0,0 +1,362 @@
+
+/**
+ * AuthorizeSecurityGroupEgress.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AuthorizeSecurityGroupEgress bean class
+            */
+        
+        public  class AuthorizeSecurityGroupEgress
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "AuthorizeSecurityGroupEgress",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AuthorizeSecurityGroupEgress
+                        */
+
+                        
+                                    protected com.amazon.ec2.AuthorizeSecurityGroupEgressType localAuthorizeSecurityGroupEgress ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AuthorizeSecurityGroupEgressType
+                           */
+                           public  com.amazon.ec2.AuthorizeSecurityGroupEgressType getAuthorizeSecurityGroupEgress(){
+                               return localAuthorizeSecurityGroupEgress;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AuthorizeSecurityGroupEgress
+                               */
+                               public void setAuthorizeSecurityGroupEgress(com.amazon.ec2.AuthorizeSecurityGroupEgressType param){
+                            
+                                            this.localAuthorizeSecurityGroupEgress=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AuthorizeSecurityGroupEgress.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localAuthorizeSecurityGroupEgress==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localAuthorizeSecurityGroupEgress.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localAuthorizeSecurityGroupEgress.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AuthorizeSecurityGroupEgress parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AuthorizeSecurityGroupEgress object =
+                new AuthorizeSecurityGroupEgress();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AuthorizeSecurityGroupEgress").equals(reader.getName())){
+                                
+                                                object.setAuthorizeSecurityGroupEgress(com.amazon.ec2.AuthorizeSecurityGroupEgressType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
new file mode 100644
index 0000000..4f79081
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * AuthorizeSecurityGroupEgressResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AuthorizeSecurityGroupEgressResponse bean class
+            */
+        
+        public  class AuthorizeSecurityGroupEgressResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "AuthorizeSecurityGroupEgressResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AuthorizeSecurityGroupEgressResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.AuthorizeSecurityGroupEgressResponseType localAuthorizeSecurityGroupEgressResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AuthorizeSecurityGroupEgressResponseType
+                           */
+                           public  com.amazon.ec2.AuthorizeSecurityGroupEgressResponseType getAuthorizeSecurityGroupEgressResponse(){
+                               return localAuthorizeSecurityGroupEgressResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AuthorizeSecurityGroupEgressResponse
+                               */
+                               public void setAuthorizeSecurityGroupEgressResponse(com.amazon.ec2.AuthorizeSecurityGroupEgressResponseType param){
+                            
+                                            this.localAuthorizeSecurityGroupEgressResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AuthorizeSecurityGroupEgressResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localAuthorizeSecurityGroupEgressResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localAuthorizeSecurityGroupEgressResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localAuthorizeSecurityGroupEgressResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AuthorizeSecurityGroupEgressResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AuthorizeSecurityGroupEgressResponse object =
+                new AuthorizeSecurityGroupEgressResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AuthorizeSecurityGroupEgressResponse").equals(reader.getName())){
+                                
+                                                object.setAuthorizeSecurityGroupEgressResponse(com.amazon.ec2.AuthorizeSecurityGroupEgressResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[43/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
new file mode 100644
index 0000000..bbad2f3
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
@@ -0,0 +1,548 @@
+
+/**
+ * AssignPrivateIpAddressesSetRequestType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssignPrivateIpAddressesSetRequestType bean class
+            */
+        
+        public  class AssignPrivateIpAddressesSetRequestType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AssignPrivateIpAddressesSetRequestType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for Item
+                        * This was an Array!
+                        */
+
+                        
+                                    protected com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[] localItem ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[]
+                           */
+                           public  com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[] getItem(){
+                               return localItem;
+                           }
+
+                           
+                        
+
+
+                               
+                              /**
+                               * validate the array for Item
+                               */
+                              protected void validateItem(com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[] param){
+                             
+                              if ((param != null) && (param.length < 1)){
+                                throw new java.lang.RuntimeException();
+                              }
+                              
+                              }
+
+
+                             /**
+                              * Auto generated setter method
+                              * @param param Item
+                              */
+                              public void setItem(com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[] param){
+                              
+                                   validateItem(param);
+
+                               
+                                      this.localItem=param;
+                              }
+
+                               
+                             
+                             /**
+                             * Auto generated add method for the array for convenience
+                             * @param param com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType
+                             */
+                             public void addItem(com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType param){
+                                   if (localItem == null){
+                                   localItem = new com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[]{};
+                                   }
+
+                            
+
+                               java.util.List list =
+                            org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
+                               list.add(param);
+                               this.localItem =
+                             (com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[])list.toArray(
+                            new com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[list.size()]);
+
+                             }
+                             
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssignPrivateIpAddressesSetRequestType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AssignPrivateIpAddressesSetRequestType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AssignPrivateIpAddressesSetRequestType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                       if (localItem!=null){
+                                            for (int i = 0;i < localItem.length;i++){
+                                                if (localItem[i] != null){
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
+                                                           factory,xmlWriter);
+                                                } else {
+                                                   
+                                                           throw new org.apache.axis2.databinding.ADBException("item cannot be null!!");
+                                                    
+                                                }
+
+                                            }
+                                     } else {
+                                        
+                                               throw new org.apache.axis2.databinding.ADBException("item cannot be null!!");
+                                        
+                                    }
+                                 
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                             if (localItem!=null) {
+                                 for (int i = 0;i < localItem.length;i++){
+
+                                    if (localItem[i] != null){
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                          "item"));
+                                         elementList.add(localItem[i]);
+                                    } else {
+                                        
+                                               throw new org.apache.axis2.databinding.ADBException("item cannot be null !!");
+                                            
+                                    }
+
+                                 }
+                             } else {
+                                 
+                                        throw new org.apache.axis2.databinding.ADBException("item cannot be null!!");
+                                    
+                             }
+
+                        
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssignPrivateIpAddressesSetRequestType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssignPrivateIpAddressesSetRequestType object =
+                new AssignPrivateIpAddressesSetRequestType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AssignPrivateIpAddressesSetRequestType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AssignPrivateIpAddressesSetRequestType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                        java.util.ArrayList list1 = new java.util.ArrayList();
+                    
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
+                                
+                                    
+                                    
+                                    // Process the array and step past its final element's end.
+                                    list1.add(com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType.Factory.parse(reader));
+                                                                
+                                                        //loop until we find a start element that is not part of this array
+                                                        boolean loopDone1 = false;
+                                                        while(!loopDone1){
+                                                            // We should be at the end element, but make sure
+                                                            while (!reader.isEndElement())
+                                                                reader.next();
+                                                            // Step out of this element
+                                                            reader.next();
+                                                            // Step to next element event.
+                                                            while (!reader.isStartElement() && !reader.isEndElement())
+                                                                reader.next();
+                                                            if (reader.isEndElement()){
+                                                                //two continuous end elements means we are exiting the xml structure
+                                                                loopDone1 = true;
+                                                            } else {
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
+                                                                    list1.add(com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType.Factory.parse(reader));
+                                                                        
+                                                                }else{
+                                                                    loopDone1 = true;
+                                                                }
+                                                            }
+                                                        }
+                                                        // call the converter utility  to convert and set the array
+                                                        
+                                                        object.setItem((com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[])
+                                                            org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+                                                                com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType.class,
+                                                                list1));
+                                                            
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
new file mode 100644
index 0000000..c814860
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
@@ -0,0 +1,755 @@
+
+/**
+ * AssignPrivateIpAddressesType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssignPrivateIpAddressesType bean class
+            */
+        
+        public  class AssignPrivateIpAddressesType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AssignPrivateIpAddressesType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for NetworkInterfaceId
+                        */
+
+                        
+                                    protected java.lang.String localNetworkInterfaceId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getNetworkInterfaceId(){
+                               return localNetworkInterfaceId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkInterfaceId
+                               */
+                               public void setNetworkInterfaceId(java.lang.String param){
+                            
+                                            this.localNetworkInterfaceId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for PrivateIpAddressesSet
+                        */
+
+                        
+                                    protected com.amazon.ec2.AssignPrivateIpAddressesSetRequestType localPrivateIpAddressesSet ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localPrivateIpAddressesSetTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AssignPrivateIpAddressesSetRequestType
+                           */
+                           public  com.amazon.ec2.AssignPrivateIpAddressesSetRequestType getPrivateIpAddressesSet(){
+                               return localPrivateIpAddressesSet;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param PrivateIpAddressesSet
+                               */
+                               public void setPrivateIpAddressesSet(com.amazon.ec2.AssignPrivateIpAddressesSetRequestType param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localPrivateIpAddressesSetTracker = true;
+                                       } else {
+                                          localPrivateIpAddressesSetTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localPrivateIpAddressesSet=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for SecondaryPrivateIpAddressCount
+                        */
+
+                        
+                                    protected int localSecondaryPrivateIpAddressCount ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localSecondaryPrivateIpAddressCountTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return int
+                           */
+                           public  int getSecondaryPrivateIpAddressCount(){
+                               return localSecondaryPrivateIpAddressCount;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param SecondaryPrivateIpAddressCount
+                               */
+                               public void setSecondaryPrivateIpAddressCount(int param){
+                            
+                                       // setting primitive attribute tracker to true
+                                       
+                                               if (param==java.lang.Integer.MIN_VALUE) {
+                                           localSecondaryPrivateIpAddressCountTracker = false;
+                                              
+                                       } else {
+                                          localSecondaryPrivateIpAddressCountTracker = true;
+                                       }
+                                   
+                                            this.localSecondaryPrivateIpAddressCount=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for AllowReassignment
+                        */
+
+                        
+                                    protected boolean localAllowReassignment ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localAllowReassignmentTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean getAllowReassignment(){
+                               return localAllowReassignment;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AllowReassignment
+                               */
+                               public void setAllowReassignment(boolean param){
+                            
+                                       // setting primitive attribute tracker to true
+                                       
+                                               if (false) {
+                                           localAllowReassignmentTracker = false;
+                                              
+                                       } else {
+                                          localAllowReassignmentTracker = true;
+                                       }
+                                   
+                                            this.localAllowReassignment=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssignPrivateIpAddressesType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AssignPrivateIpAddressesType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AssignPrivateIpAddressesType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"networkInterfaceId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"networkInterfaceId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("networkInterfaceId");
+                                    }
+                                
+
+                                          if (localNetworkInterfaceId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localNetworkInterfaceId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                              if (localPrivateIpAddressesSetTracker){
+                                            if (localPrivateIpAddressesSet==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("privateIpAddressesSet cannot be null!!");
+                                            }
+                                           localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","privateIpAddressesSet"),
+                                               factory,xmlWriter);
+                                        } if (localSecondaryPrivateIpAddressCountTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"secondaryPrivateIpAddressCount", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"secondaryPrivateIpAddressCount");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("secondaryPrivateIpAddressCount");
+                                    }
+                                
+                                               if (localSecondaryPrivateIpAddressCount==java.lang.Integer.MIN_VALUE) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("secondaryPrivateIpAddressCount cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSecondaryPrivateIpAddressCount));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localAllowReassignmentTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"allowReassignment", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"allowReassignment");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("allowReassignment");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("allowReassignment cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAllowReassignment));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkInterfaceId"));
+                                 
+                                        if (localNetworkInterfaceId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNetworkInterfaceId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                        }
+                                     if (localPrivateIpAddressesSetTracker){
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "privateIpAddressesSet"));
+                            
+                            
+                                    if (localPrivateIpAddressesSet==null){
+                                         throw new org.apache.axis2.databinding.ADBException("privateIpAddressesSet cannot be null!!");
+                                    }
+                                    elementList.add(localPrivateIpAddressesSet);
+                                } if (localSecondaryPrivateIpAddressCountTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "secondaryPrivateIpAddressCount"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSecondaryPrivateIpAddressCount));
+                            } if (localAllowReassignmentTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "allowReassignment"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAllowReassignment));
+                            }
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssignPrivateIpAddressesType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssignPrivateIpAddressesType object =
+                new AssignPrivateIpAddressesType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AssignPrivateIpAddressesType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AssignPrivateIpAddressesType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkInterfaceId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setNetworkInterfaceId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","privateIpAddressesSet").equals(reader.getName())){
+                                
+                                                object.setPrivateIpAddressesSet(com.amazon.ec2.AssignPrivateIpAddressesSetRequestType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","secondaryPrivateIpAddressCount").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setSecondaryPrivateIpAddressCount(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToInt(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                               object.setSecondaryPrivateIpAddressCount(java.lang.Integer.MIN_VALUE);
+                                           
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","allowReassignment").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setAllowReassignment(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                  
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddress.java b/awsapi/src/com/amazon/ec2/AssociateAddress.java
index 912f0a6..0a19632 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddress.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddress.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AssociateAddress.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AssociateAddress",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AssociateAddress").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AssociateAddress").equals(reader.getName())){
                                 
                                                 object.setAssociateAddress(com.amazon.ec2.AssociateAddressType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
index 583b405..cc7d628 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AssociateAddressResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AssociateAddressResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AssociateAddressResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AssociateAddressResponse").equals(reader.getName())){
                                 
                                                 object.setAssociateAddressResponse(com.amazon.ec2.AssociateAddressResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
index 6cce69b..df22008 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AssociateAddressResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AssociateAddressResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -107,6 +91,50 @@
                                }
                             
 
+                        /**
+                        * field for AssociationId
+                        */
+
+                        
+                                    protected java.lang.String localAssociationId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localAssociationIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getAssociationId(){
+                               return localAssociationId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AssociationId
+                               */
+                               public void setAssociationId(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localAssociationIdTracker = true;
+                                       } else {
+                                          localAssociationIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localAssociationId=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -190,7 +218,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AssociateAddressResponseType",
@@ -204,7 +232,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +266,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -266,7 +294,41 @@
                                                }
                                     
                                    xmlWriter.writeEndElement();
-                             
+                              if (localAssociationIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"associationId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"associationId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("associationId");
+                                    }
+                                
+
+                                          if (localAssociationId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("associationId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localAssociationId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
                     xmlWriter.writeEndElement();
                
 
@@ -429,7 +491,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,12 +500,21 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
-                            
+                             if (localAssociationIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "associationId"));
+                                 
+                                        if (localAssociationId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAssociationId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("associationId cannot be null!!");
+                                        }
+                                    }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -522,7 +593,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +612,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -556,7 +627,25 @@
                                     // A start element we are not expecting indicates an invalid parameter was passed
                                     throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
                                 }
-                              
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","associationId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setAssociationId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                  
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();
                             


[62/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DhcpValueSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpValueSetType.java b/awsapi/src/com/amazon/ec2/DhcpValueSetType.java
index 76e3936..aad2ecc 100644
--- a/awsapi/src/com/amazon/ec2/DhcpValueSetType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpValueSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DhcpValueSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DhcpValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpValueType.java b/awsapi/src/com/amazon/ec2/DhcpValueType.java
index 700aca8..0d443cf 100644
--- a/awsapi/src/com/amazon/ec2/DhcpValueType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpValueType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DhcpValueType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java
index 41d6a12..f564511 100644
--- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java
+++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisableVgwRoutePropagation.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java
index 1b3f0b8..cadaf1b 100644
--- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java
+++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisableVgwRoutePropagationRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java
index f67ca8a..5c77e74 100644
--- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java
+++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisableVgwRoutePropagationResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java
index eba7296..eec85ea 100644
--- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisableVgwRoutePropagationResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisassociateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddress.java b/awsapi/src/com/amazon/ec2/DisassociateAddress.java
index 83c310c..889a1db 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateAddress.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateAddress.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisassociateAddress.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java b/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java
index 5dcdcf9..186f5e5 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisassociateAddressResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java b/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java
index 944a898..bb756c6 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisassociateAddressResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisassociateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddressType.java b/awsapi/src/com/amazon/ec2/DisassociateAddressType.java
index b3c018d..3e77734 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateAddressType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisassociateAddressType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java
index deb2406..399f283 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisassociateRouteTable.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java
index 3248ca5..15f0874 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisassociateRouteTableResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java
index 93a0dd1..9804642 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisassociateRouteTableResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java
index 89e5897..58994cc 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DisassociateRouteTableType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java b/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java
index 0575466..c5e476a 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DiskImageDescriptionType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DiskImageDetailType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageDetailType.java b/awsapi/src/com/amazon/ec2/DiskImageDetailType.java
index 5ec2dce..c7da459 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageDetailType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageDetailType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DiskImageDetailType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DiskImageSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageSetType.java b/awsapi/src/com/amazon/ec2/DiskImageSetType.java
index 3a4eeb7..a93274d 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageSetType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DiskImageSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DiskImageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageType.java b/awsapi/src/com/amazon/ec2/DiskImageType.java
index 2083cd8..6d58d31 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DiskImageType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java b/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java
index eff252b..dd49d26 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DiskImageVolumeDescriptionType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java b/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java
index fa75e0d..6547130 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DiskImageVolumeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java b/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java
index 10f8370..2b2c5ca 100644
--- a/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java
+++ b/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EbsBlockDeviceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java b/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java
index 1f87f3f..3ed53d8 100644
--- a/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java
+++ b/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EbsInstanceBlockDeviceMappingResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EmptyElementType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EmptyElementType.java b/awsapi/src/com/amazon/ec2/EmptyElementType.java
index 8029e94..1546712 100644
--- a/awsapi/src/com/amazon/ec2/EmptyElementType.java
+++ b/awsapi/src/com/amazon/ec2/EmptyElementType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EmptyElementType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java
index b3a8b97..06f4b79 100644
--- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java
+++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EnableVgwRoutePropagation.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java
index 43597a6..20f4c85 100644
--- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java
+++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EnableVgwRoutePropagationRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java
index 9ae66ae..af35927 100644
--- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java
+++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EnableVgwRoutePropagationResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java
index 3f95f29..576f98e 100644
--- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java
+++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EnableVgwRoutePropagationResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EnableVolumeIO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIO.java b/awsapi/src/com/amazon/ec2/EnableVolumeIO.java
index 283e972..302bf95 100644
--- a/awsapi/src/com/amazon/ec2/EnableVolumeIO.java
+++ b/awsapi/src/com/amazon/ec2/EnableVolumeIO.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EnableVolumeIO.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java
index 504411a..4f9829c 100644
--- a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java
+++ b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EnableVolumeIOResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java
index 559a221..c5a1417 100644
--- a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java
+++ b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EnableVolumeIOResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java b/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java
index 910d3f8..2548609 100644
--- a/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java
+++ b/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * EnableVolumeIOType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java b/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java
index 51fa19c..d254762 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ExportTaskIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ExportTaskIdType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskIdType.java b/awsapi/src/com/amazon/ec2/ExportTaskIdType.java
index dd578c6..a6d02f0 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskIdType.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskIdType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ExportTaskIdType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java
index 9af37aa..2830df8 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ExportTaskResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java
index 22efe04..669e925 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ExportTaskResponseTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java
index 4d6fba7..c5712b8 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ExportTaskResponseTypeChoice_type1.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java b/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java
index caf5df7..cf3ba0c 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ExportTaskSetResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java b/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java
index ee75ba2..a50a0fc 100644
--- a/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ExportToS3TaskResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java b/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java
index b3255f1..f4c54e1 100644
--- a/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java
+++ b/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ExportToS3TaskType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ExtensionMapper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExtensionMapper.java b/awsapi/src/com/amazon/ec2/ExtensionMapper.java
index 5bf8437..f73fbfc 100644
--- a/awsapi/src/com/amazon/ec2/ExtensionMapper.java
+++ b/awsapi/src/com/amazon/ec2/ExtensionMapper.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ExtensionMapper.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/FilterSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/FilterSetType.java b/awsapi/src/com/amazon/ec2/FilterSetType.java
index 3ab32f4..5058e9d 100644
--- a/awsapi/src/com/amazon/ec2/FilterSetType.java
+++ b/awsapi/src/com/amazon/ec2/FilterSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * FilterSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/FilterType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/FilterType.java b/awsapi/src/com/amazon/ec2/FilterType.java
index 90a0ae2..f200e50 100644
--- a/awsapi/src/com/amazon/ec2/FilterType.java
+++ b/awsapi/src/com/amazon/ec2/FilterType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * FilterType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/GetConsoleOutput.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutput.java b/awsapi/src/com/amazon/ec2/GetConsoleOutput.java
index d1821f9..2e57d8e 100644
--- a/awsapi/src/com/amazon/ec2/GetConsoleOutput.java
+++ b/awsapi/src/com/amazon/ec2/GetConsoleOutput.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * GetConsoleOutput.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java
index 87e8d2b..a067832 100644
--- a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java
+++ b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * GetConsoleOutputResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java
index 835b39e..26d9c50 100644
--- a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java
+++ b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * GetConsoleOutputResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java b/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java
index 596c9af..457cc04 100644
--- a/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java
+++ b/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * GetConsoleOutputType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/GetPasswordData.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetPasswordData.java b/awsapi/src/com/amazon/ec2/GetPasswordData.java
index 01dcafe..3738b55 100644
--- a/awsapi/src/com/amazon/ec2/GetPasswordData.java
+++ b/awsapi/src/com/amazon/ec2/GetPasswordData.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * GetPasswordData.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java b/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java
index 01335e0..bc973a0 100644
--- a/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java
+++ b/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * GetPasswordDataResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java b/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java
index be64b6f..4af138b 100644
--- a/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java
+++ b/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * GetPasswordDataResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/GetPasswordDataType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetPasswordDataType.java b/awsapi/src/com/amazon/ec2/GetPasswordDataType.java
index 372b981..a4ecd0f 100644
--- a/awsapi/src/com/amazon/ec2/GetPasswordDataType.java
+++ b/awsapi/src/com/amazon/ec2/GetPasswordDataType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * GetPasswordDataType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/GroupItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GroupItemType.java b/awsapi/src/com/amazon/ec2/GroupItemType.java
index 327e17a..acab0a7 100644
--- a/awsapi/src/com/amazon/ec2/GroupItemType.java
+++ b/awsapi/src/com/amazon/ec2/GroupItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * GroupItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/GroupSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GroupSetType.java b/awsapi/src/com/amazon/ec2/GroupSetType.java
index 852038b..87b0397 100644
--- a/awsapi/src/com/amazon/ec2/GroupSetType.java
+++ b/awsapi/src/com/amazon/ec2/GroupSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * GroupSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java b/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java
index 386946c..77994ab 100644
--- a/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java
+++ b/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * IamInstanceProfileRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java b/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java
index 9e18be7..608da55 100644
--- a/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java
+++ b/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * IamInstanceProfileResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java b/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java
index c685cfc..a08a8e3 100644
--- a/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java
+++ b/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * IcmpTypeCodeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportInstance.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstance.java b/awsapi/src/com/amazon/ec2/ImportInstance.java
index 466e3b3..e81d133 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstance.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstance.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportInstance.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java b/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java
index 0025c28..14992f7 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportInstanceGroupItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java b/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java
index e18e166..241bde6 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportInstanceGroupSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java b/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java
index 2d030d5..f5670d6 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportInstanceLaunchSpecificationType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java b/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java
index d92304c..f83cf2b 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportInstanceResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java b/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java
index 5ec4b1d..5a12d41 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportInstanceResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java b/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java
index 0987162..528f576 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportInstanceTaskDetailsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportInstanceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceType.java b/awsapi/src/com/amazon/ec2/ImportInstanceType.java
index 5fb6d04..1fee08d 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportInstanceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java
index fd76605..1bca221 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportInstanceVolumeDetailItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java
index f2f1596..6733939 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportInstanceVolumeDetailSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportKeyPair.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPair.java b/awsapi/src/com/amazon/ec2/ImportKeyPair.java
index 022e299..08ab47c 100644
--- a/awsapi/src/com/amazon/ec2/ImportKeyPair.java
+++ b/awsapi/src/com/amazon/ec2/ImportKeyPair.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportKeyPair.java


[17/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java b/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
index cb8f044..f686dd1 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSubnetResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateSubnetResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateSubnetResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localSubnet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("subnet cannot be null!!");
                                             }
-                                           localSubnet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","subnet"),
+                                           localSubnet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","subnet"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "subnet"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","subnet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","subnet").equals(reader.getName())){
                                 
                                                 object.setSubnet(com.amazon.ec2.SubnetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSubnetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetType.java b/awsapi/src/com/amazon/ec2/CreateSubnetType.java
index f0fb291..583f84c 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnetType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSubnetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateSubnetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -234,7 +218,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateSubnetType",
@@ -248,7 +232,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -282,7 +266,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -316,7 +300,7 @@
                                     
                                    xmlWriter.writeEndElement();
                               if (localAvailabilityZoneTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -512,7 +496,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpcId"));
                                  
                                         if (localVpcId != null){
@@ -521,7 +505,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("vpcId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "cidrBlock"));
                                  
                                         if (localCidrBlock != null){
@@ -530,7 +514,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("cidrBlock cannot be null!!");
                                         }
                                      if (localAvailabilityZoneTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "availabilityZone"));
                                  
                                         if (localAvailabilityZone != null){
@@ -617,7 +601,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpcId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpcId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -636,7 +620,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","cidrBlock").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","cidrBlock").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -655,7 +639,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","availabilityZone").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","availabilityZone").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateTags.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTags.java b/awsapi/src/com/amazon/ec2/CreateTags.java
index 397c0d4..a3a00a6 100644
--- a/awsapi/src/com/amazon/ec2/CreateTags.java
+++ b/awsapi/src/com/amazon/ec2/CreateTags.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateTags.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateTags",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateTags").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateTags").equals(reader.getName())){
                                 
                                                 object.setCreateTags(com.amazon.ec2.CreateTagsType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTagsResponse.java b/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
index ad0ff5d..2e95c0c 100644
--- a/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateTagsResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateTagsResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateTagsResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateTagsResponse").equals(reader.getName())){
                                 
                                                 object.setCreateTagsResponse(com.amazon.ec2.CreateTagsResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java b/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
index b8b0584..c3e7f4c 100644
--- a/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateTagsResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateTagsResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateTagsResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateTagsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTagsType.java b/awsapi/src/com/amazon/ec2/CreateTagsType.java
index c57e34b..c61c21e 100644
--- a/awsapi/src/com/amazon/ec2/CreateTagsType.java
+++ b/awsapi/src/com/amazon/ec2/CreateTagsType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateTagsType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateTagsType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateTagsType",
@@ -207,13 +191,13 @@
                                             if (localResourcesSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("resourcesSet cannot be null!!");
                                             }
-                                           localResourcesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","resourcesSet"),
+                                           localResourcesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","resourcesSet"),
                                                factory,xmlWriter);
                                         
                                             if (localTagSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("tagSet cannot be null!!");
                                             }
-                                           localTagSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","tagSet"),
+                                           localTagSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","tagSet"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -378,7 +362,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "resourcesSet"));
                             
                             
@@ -387,7 +371,7 @@
                                     }
                                     elementList.add(localResourcesSet);
                                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "tagSet"));
                             
                             
@@ -474,7 +458,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","resourcesSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","resourcesSet").equals(reader.getName())){
                                 
                                                 object.setResourcesSet(com.amazon.ec2.ResourceIdSetType.Factory.parse(reader));
                                               
@@ -490,7 +474,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","tagSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","tagSet").equals(reader.getName())){
                                 
                                                 object.setTagSet(com.amazon.ec2.ResourceTagSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolume.java b/awsapi/src/com/amazon/ec2/CreateVolume.java
index 74db821..fd25eec 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolume.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolume.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVolume.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateVolume",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateVolume").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateVolume").equals(reader.getName())){
                                 
                                                 object.setCreateVolume(com.amazon.ec2.CreateVolumeType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
index 80e69d5..a12aebd 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVolumePermissionItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVolumePermissionItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -233,7 +217,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVolumePermissionItemType",
@@ -247,7 +231,7 @@
                
                    }
                 if (localUserIdTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -281,7 +265,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              } if (localGroupTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -477,7 +461,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                  if (localUserIdTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "userId"));
                                  
                                         if (localUserId != null){
@@ -486,7 +470,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("userId cannot be null!!");
                                         }
                                     } if (localGroupTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "group"));
                                  
                                         if (localGroup != null){
@@ -573,7 +557,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","userId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","userId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -586,7 +570,7 @@
                                 
                                         else
                                     
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","group").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","group").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
index 58f9e01..fac08ee 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVolumePermissionListType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVolumePermissionListType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVolumePermissionListType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.CreateVolumePermissionItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
index 2d6ecfb..28265dc 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVolumePermissionOperationType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVolumePermissionOperationType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -233,7 +217,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVolumePermissionOperationType",
@@ -250,13 +234,13 @@
                                             if (localAdd==null){
                                                  throw new org.apache.axis2.databinding.ADBException("add cannot be null!!");
                                             }
-                                           localAdd.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","add"),
+                                           localAdd.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","add"),
                                                factory,xmlWriter);
                                         } if (localRemoveTracker){
                                             if (localRemove==null){
                                                  throw new org.apache.axis2.databinding.ADBException("remove cannot be null!!");
                                             }
-                                           localRemove.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","remove"),
+                                           localRemove.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","remove"),
                                                factory,xmlWriter);
                                         }
                     xmlWriter.writeEndElement();
@@ -421,7 +405,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                  if (localAddTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "add"));
                             
                             
@@ -430,7 +414,7 @@
                                     }
                                     elementList.add(localAdd);
                                 } if (localRemoveTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "remove"));
                             
                             
@@ -517,7 +501,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","add").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","add").equals(reader.getName())){
                                 
                                                 object.setAdd(com.amazon.ec2.CreateVolumePermissionListType.Factory.parse(reader));
                                               
@@ -527,7 +511,7 @@
                                 
                                         else
                                     
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","remove").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","remove").equals(reader.getName())){
                                 
                                                 object.setRemove(com.amazon.ec2.CreateVolumePermissionListType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java b/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
index 3cdf95c..b086b8c 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVolumeResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateVolumeResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateVolumeResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateVolumeResponse").equals(reader.getName())){
                                 
                                                 object.setCreateVolumeResponse(com.amazon.ec2.CreateVolumeResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java b/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
index 861122f..b61914e 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVolumeResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVolumeResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -257,6 +241,81 @@
                                }
                             
 
+                        /**
+                        * field for VolumeType
+                        */
+
+                        
+                                    protected java.lang.String localVolumeType ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getVolumeType(){
+                               return localVolumeType;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param VolumeType
+                               */
+                               public void setVolumeType(java.lang.String param){
+                            
+                                            this.localVolumeType=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for Iops
+                        */
+
+                        
+                                    protected int localIops ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localIopsTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return int
+                           */
+                           public  int getIops(){
+                               return localIops;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Iops
+                               */
+                               public void setIops(int param){
+                            
+                                       // setting primitive attribute tracker to true
+                                       
+                                               if (param==java.lang.Integer.MIN_VALUE) {
+                                           localIopsTracker = false;
+                                              
+                                       } else {
+                                          localIopsTracker = true;
+                                       }
+                                   
+                                            this.localIops=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -340,7 +399,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVolumeResponseType",
@@ -354,7 +413,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -388,7 +447,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -422,7 +481,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -456,7 +515,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -490,7 +549,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -524,7 +583,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -558,7 +617,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -592,6 +651,69 @@
                                     
                                    xmlWriter.writeEndElement();
                              
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"volumeType", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"volumeType");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("volumeType");
+                                    }
+                                
+
+                                          if (localVolumeType==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("volumeType cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localVolumeType);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                              if (localIopsTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"iops", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"iops");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("iops");
+                                    }
+                                
+                                               if (localIops==java.lang.Integer.MIN_VALUE) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("iops cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localIops));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
                     xmlWriter.writeEndElement();
                
 
@@ -754,7 +876,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -763,7 +885,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "volumeId"));
                                  
                                         if (localVolumeId != null){
@@ -772,7 +894,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "size"));
                                  
                                         if (localSize != null){
@@ -781,7 +903,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("size cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "snapshotId"));
                                  
                                         if (localSnapshotId != null){
@@ -790,7 +912,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("snapshotId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "availabilityZone"));
                                  
                                         if (localAvailabilityZone != null){
@@ -799,7 +921,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("availabilityZone cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "status"));
                                  
                                         if (localStatus != null){
@@ -808,7 +930,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "createTime"));
                                  
                                         if (localCreateTime != null){
@@ -817,6 +939,21 @@
                                            throw new org.apache.axis2.databinding.ADBException("createTime cannot be null!!");
                                         }
                                     
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "volumeType"));
+                                 
+                                        if (localVolumeType != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVolumeType));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("volumeType cannot be null!!");
+                                        }
+                                     if (localIopsTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "iops"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localIops));
+                            }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -895,7 +1032,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -914,7 +1051,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","volumeId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","volumeId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -933,7 +1070,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","size").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","size").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -952,7 +1089,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","snapshotId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","snapshotId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -971,7 +1108,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","availabilityZone").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","availabilityZone").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -990,7 +1127,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","status").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","status").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1009,7 +1146,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","createTime").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","createTime").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1024,7 +1161,46 @@
                                     // A start element we are not expecting indicates an invalid parameter was passed
                                     throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
                                 }
-                              
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","volumeType").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setVolumeType(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","iops").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setIops(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToInt(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                               object.setIops(java.lang.Integer.MIN_VALUE);
+                                           
+                                    }
+                                  
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();
                             


[32/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
new file mode 100644
index 0000000..9ad2ac1
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
@@ -0,0 +1,362 @@
+
+/**
+ * CancelReservedInstancesListing.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CancelReservedInstancesListing bean class
+            */
+        
+        public  class CancelReservedInstancesListing
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CancelReservedInstancesListing",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CancelReservedInstancesListing
+                        */
+
+                        
+                                    protected com.amazon.ec2.CancelReservedInstancesListingType localCancelReservedInstancesListing ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CancelReservedInstancesListingType
+                           */
+                           public  com.amazon.ec2.CancelReservedInstancesListingType getCancelReservedInstancesListing(){
+                               return localCancelReservedInstancesListing;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CancelReservedInstancesListing
+                               */
+                               public void setCancelReservedInstancesListing(com.amazon.ec2.CancelReservedInstancesListingType param){
+                            
+                                            this.localCancelReservedInstancesListing=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CancelReservedInstancesListing.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCancelReservedInstancesListing==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCancelReservedInstancesListing.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCancelReservedInstancesListing.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CancelReservedInstancesListing parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CancelReservedInstancesListing object =
+                new CancelReservedInstancesListing();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CancelReservedInstancesListing").equals(reader.getName())){
+                                
+                                                object.setCancelReservedInstancesListing(com.amazon.ec2.CancelReservedInstancesListingType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
new file mode 100644
index 0000000..2d53d02
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CancelReservedInstancesListingResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CancelReservedInstancesListingResponse bean class
+            */
+        
+        public  class CancelReservedInstancesListingResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CancelReservedInstancesListingResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CancelReservedInstancesListingResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CancelReservedInstancesListingResponseType localCancelReservedInstancesListingResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CancelReservedInstancesListingResponseType
+                           */
+                           public  com.amazon.ec2.CancelReservedInstancesListingResponseType getCancelReservedInstancesListingResponse(){
+                               return localCancelReservedInstancesListingResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CancelReservedInstancesListingResponse
+                               */
+                               public void setCancelReservedInstancesListingResponse(com.amazon.ec2.CancelReservedInstancesListingResponseType param){
+                            
+                                            this.localCancelReservedInstancesListingResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CancelReservedInstancesListingResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCancelReservedInstancesListingResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCancelReservedInstancesListingResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCancelReservedInstancesListingResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CancelReservedInstancesListingResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CancelReservedInstancesListingResponse object =
+                new CancelReservedInstancesListingResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CancelReservedInstancesListingResponse").equals(reader.getName())){
+                                
+                                                object.setCancelReservedInstancesListingResponse(com.amazon.ec2.CancelReservedInstancesListingResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
new file mode 100644
index 0000000..05d8011
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
@@ -0,0 +1,544 @@
+
+/**
+ * CancelReservedInstancesListingResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CancelReservedInstancesListingResponseType bean class
+            */
+        
+        public  class CancelReservedInstancesListingResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CancelReservedInstancesListingResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for ReservedInstancesListingsSet
+                        */
+
+                        
+                                    protected com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType localReservedInstancesListingsSet ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType
+                           */
+                           public  com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType getReservedInstancesListingsSet(){
+                               return localReservedInstancesListingsSet;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param ReservedInstancesListingsSet
+                               */
+                               public void setReservedInstancesListingsSet(com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType param){
+                            
+                                            this.localReservedInstancesListingsSet=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CancelReservedInstancesListingResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CancelReservedInstancesListingResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CancelReservedInstancesListingResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                            if (localReservedInstancesListingsSet==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!");
+                                            }
+                                           localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","reservedInstancesListingsSet"),
+                                               factory,xmlWriter);
+                                        
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "reservedInstancesListingsSet"));
+                            
+                            
+                                    if (localReservedInstancesListingsSet==null){
+                                         throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!");
+                                    }
+                                    elementList.add(localReservedInstancesListingsSet);
+                                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CancelReservedInstancesListingResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CancelReservedInstancesListingResponseType object =
+                new CancelReservedInstancesListingResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CancelReservedInstancesListingResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CancelReservedInstancesListingResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","reservedInstancesListingsSet").equals(reader.getName())){
+                                
+                                                object.setReservedInstancesListingsSet(com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
new file mode 100644
index 0000000..a6e6674
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
@@ -0,0 +1,483 @@
+
+/**
+ * CancelReservedInstancesListingType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CancelReservedInstancesListingType bean class
+            */
+        
+        public  class CancelReservedInstancesListingType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CancelReservedInstancesListingType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for ReservedInstancesListingId
+                        */
+
+                        
+                                    protected java.lang.String localReservedInstancesListingId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getReservedInstancesListingId(){
+                               return localReservedInstancesListingId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param ReservedInstancesListingId
+                               */
+                               public void setReservedInstancesListingId(java.lang.String param){
+                            
+                                            this.localReservedInstancesListingId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CancelReservedInstancesListingType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CancelReservedInstancesListingType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CancelReservedInstancesListingType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"reservedInstancesListingId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"reservedInstancesListingId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("reservedInstancesListingId");
+                                    }
+                                
+
+                                          if (localReservedInstancesListingId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localReservedInstancesListingId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "reservedInstancesListingId"));
+                                 
+                                        if (localReservedInstancesListingId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localReservedInstancesListingId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CancelReservedInstancesListingType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CancelReservedInstancesListingType object =
+                new CancelReservedInstancesListingType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CancelReservedInstancesListingType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CancelReservedInstancesListingType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","reservedInstancesListingId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setReservedInstancesListingId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
index 6d39001..da1c3a2 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelSpotInstanceRequests.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CancelSpotInstanceRequests",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CancelSpotInstanceRequests").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CancelSpotInstanceRequests").equals(reader.getName())){
                                 
                                                 object.setCancelSpotInstanceRequests(com.amazon.ec2.CancelSpotInstanceRequestsType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
index 7dcc2d4..7a1ea23 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelSpotInstanceRequestsResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CancelSpotInstanceRequestsResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CancelSpotInstanceRequestsResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CancelSpotInstanceRequestsResponse").equals(reader.getName())){
                                 
                                                 object.setCancelSpotInstanceRequestsResponse(com.amazon.ec2.CancelSpotInstanceRequestsResponseType.Factory.parse(reader));
                                             


[55/71] [abbrv] git commit: updated refs/heads/master to 26af71b

Posted by li...@apache.org.
CLOUDSTACK-1444. Fixing cloudstack-aws-api-register to set ec2 api version to the latest. [Support for EC2 API version 2012-08-15]

Signed-off-by: Likitha Shetty <li...@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a80031c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a80031c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a80031c

Branch: refs/heads/master
Commit: 7a80031ce6d560b82178b2938b7ac6a5a6022996
Parents: 3cfaa92
Author: Likitha Shetty <li...@citrix.com>
Authored: Fri Jun 28 09:43:42 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Jul 4 10:08:48 2013 +0530

----------------------------------------------------------------------
 awsapi-setup/setup/cloudstack-aws-api-register | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a80031c/awsapi-setup/setup/cloudstack-aws-api-register
----------------------------------------------------------------------
diff --git a/awsapi-setup/setup/cloudstack-aws-api-register b/awsapi-setup/setup/cloudstack-aws-api-register
index ea57d0b..07eacf1 100644
--- a/awsapi-setup/setup/cloudstack-aws-api-register
+++ b/awsapi-setup/setup/cloudstack-aws-api-register
@@ -40,7 +40,7 @@ def get_signature(key, url, query):
 
 def get_url(url, api_key, secret_key, action, query):
     amzn_string = 'AWSAccessKeyId=' + api_key + '&Action=' + action + '&SignatureMethod=HmacSHA1'
-    amzn_string += '&SignatureVersion=2&Timestamp='+ datetime.now().isoformat()[:19] +'Z&Version=2010-11-15'
+    amzn_string += '&SignatureVersion=2&Timestamp='+ datetime.now().isoformat()[:19] +'Z&Version=2012-08-15'
     query = amzn_string + '&' + query
     url = url + '?' + query + '&Signature=' + get_signature(secret_key, url, query)
     try:


[04/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
new file mode 100644
index 0000000..1e8c15c
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteVpnConnectionRouteResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteVpnConnectionRouteResponse bean class
+            */
+        
+        public  class DeleteVpnConnectionRouteResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteVpnConnectionRouteResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteVpnConnectionRouteResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteVpnConnectionRouteResponseType localDeleteVpnConnectionRouteResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteVpnConnectionRouteResponseType
+                           */
+                           public  com.amazon.ec2.DeleteVpnConnectionRouteResponseType getDeleteVpnConnectionRouteResponse(){
+                               return localDeleteVpnConnectionRouteResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteVpnConnectionRouteResponse
+                               */
+                               public void setDeleteVpnConnectionRouteResponse(com.amazon.ec2.DeleteVpnConnectionRouteResponseType param){
+                            
+                                            this.localDeleteVpnConnectionRouteResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteVpnConnectionRouteResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteVpnConnectionRouteResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteVpnConnectionRouteResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteVpnConnectionRouteResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteVpnConnectionRouteResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteVpnConnectionRouteResponse object =
+                new DeleteVpnConnectionRouteResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteVpnConnectionRouteResponse").equals(reader.getName())){
+                                
+                                                object.setDeleteVpnConnectionRouteResponse(com.amazon.ec2.DeleteVpnConnectionRouteResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
new file mode 100644
index 0000000..6dbb3e0
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * DeleteVpnConnectionRouteResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteVpnConnectionRouteResponseType bean class
+            */
+        
+        public  class DeleteVpnConnectionRouteResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteVpnConnectionRouteResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteVpnConnectionRouteResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteVpnConnectionRouteResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteVpnConnectionRouteResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteVpnConnectionRouteResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteVpnConnectionRouteResponseType object =
+                new DeleteVpnConnectionRouteResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteVpnConnectionRouteResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteVpnConnectionRouteResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
new file mode 100644
index 0000000..cf91b72
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
@@ -0,0 +1,575 @@
+
+/**
+ * DeleteVpnConnectionRouteType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteVpnConnectionRouteType bean class
+            */
+        
+        public  class DeleteVpnConnectionRouteType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteVpnConnectionRouteType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for VpnConnectionId
+                        */
+
+                        
+                                    protected java.lang.String localVpnConnectionId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getVpnConnectionId(){
+                               return localVpnConnectionId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param VpnConnectionId
+                               */
+                               public void setVpnConnectionId(java.lang.String param){
+                            
+                                            this.localVpnConnectionId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for DestinationCidrBlock
+                        */
+
+                        
+                                    protected java.lang.String localDestinationCidrBlock ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getDestinationCidrBlock(){
+                               return localDestinationCidrBlock;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DestinationCidrBlock
+                               */
+                               public void setDestinationCidrBlock(java.lang.String param){
+                            
+                                            this.localDestinationCidrBlock=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteVpnConnectionRouteType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteVpnConnectionRouteType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteVpnConnectionRouteType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"vpnConnectionId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"vpnConnectionId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("vpnConnectionId");
+                                    }
+                                
+
+                                          if (localVpnConnectionId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("vpnConnectionId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localVpnConnectionId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"destinationCidrBlock", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"destinationCidrBlock");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("destinationCidrBlock");
+                                    }
+                                
+
+                                          if (localDestinationCidrBlock==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("destinationCidrBlock cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localDestinationCidrBlock);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "vpnConnectionId"));
+                                 
+                                        if (localVpnConnectionId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVpnConnectionId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("vpnConnectionId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "destinationCidrBlock"));
+                                 
+                                        if (localDestinationCidrBlock != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDestinationCidrBlock));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("destinationCidrBlock cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteVpnConnectionRouteType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteVpnConnectionRouteType object =
+                new DeleteVpnConnectionRouteType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteVpnConnectionRouteType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteVpnConnectionRouteType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpnConnectionId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setVpnConnectionId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","destinationCidrBlock").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setDestinationCidrBlock(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
index 30de03b..c074ae2 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpnConnectionType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteVpnConnectionType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteVpnConnectionType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpnConnectionId"));
                                  
                                         if (localVpnConnectionId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpnConnectionId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpnConnectionId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java b/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
index caaeb38..33fe5a9 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpnGateway.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteVpnGateway",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteVpnGateway").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteVpnGateway").equals(reader.getName())){
                                 
                                                 object.setDeleteVpnGateway(com.amazon.ec2.DeleteVpnGatewayType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
index f772b41..e7089b3 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpnGatewayResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteVpnGatewayResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteVpnGatewayResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteVpnGatewayResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteVpnGatewayResponse(com.amazon.ec2.DeleteVpnGatewayResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
index 31d469f..d8a32c9 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpnGatewayResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteVpnGatewayResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteVpnGatewayResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     


[10/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
new file mode 100644
index 0000000..862ae2c
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * DeleteNetworkAclResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkAclResponseType bean class
+            */
+        
+        public  class DeleteNetworkAclResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteNetworkAclResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkAclResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteNetworkAclResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteNetworkAclResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkAclResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkAclResponseType object =
+                new DeleteNetworkAclResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteNetworkAclResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteNetworkAclResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
new file mode 100644
index 0000000..e197c25
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
@@ -0,0 +1,483 @@
+
+/**
+ * DeleteNetworkAclType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkAclType bean class
+            */
+        
+        public  class DeleteNetworkAclType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteNetworkAclType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for NetworkAclId
+                        */
+
+                        
+                                    protected java.lang.String localNetworkAclId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getNetworkAclId(){
+                               return localNetworkAclId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkAclId
+                               */
+                               public void setNetworkAclId(java.lang.String param){
+                            
+                                            this.localNetworkAclId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkAclType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteNetworkAclType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteNetworkAclType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"networkAclId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"networkAclId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("networkAclId");
+                                    }
+                                
+
+                                          if (localNetworkAclId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("networkAclId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localNetworkAclId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkAclId"));
+                                 
+                                        if (localNetworkAclId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNetworkAclId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("networkAclId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkAclType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkAclType object =
+                new DeleteNetworkAclType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteNetworkAclType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteNetworkAclType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkAclId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setNetworkAclId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
new file mode 100644
index 0000000..dd0b7f8
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteNetworkInterface.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkInterface bean class
+            */
+        
+        public  class DeleteNetworkInterface
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteNetworkInterface",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteNetworkInterface
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteNetworkInterfaceType localDeleteNetworkInterface ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteNetworkInterfaceType
+                           */
+                           public  com.amazon.ec2.DeleteNetworkInterfaceType getDeleteNetworkInterface(){
+                               return localDeleteNetworkInterface;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteNetworkInterface
+                               */
+                               public void setDeleteNetworkInterface(com.amazon.ec2.DeleteNetworkInterfaceType param){
+                            
+                                            this.localDeleteNetworkInterface=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkInterface.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteNetworkInterface==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteNetworkInterface.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteNetworkInterface.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkInterface parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkInterface object =
+                new DeleteNetworkInterface();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteNetworkInterface").equals(reader.getName())){
+                                
+                                                object.setDeleteNetworkInterface(com.amazon.ec2.DeleteNetworkInterfaceType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
new file mode 100644
index 0000000..d95a97f
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteNetworkInterfaceResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkInterfaceResponse bean class
+            */
+        
+        public  class DeleteNetworkInterfaceResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteNetworkInterfaceResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteNetworkInterfaceResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteNetworkInterfaceResponseType localDeleteNetworkInterfaceResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteNetworkInterfaceResponseType
+                           */
+                           public  com.amazon.ec2.DeleteNetworkInterfaceResponseType getDeleteNetworkInterfaceResponse(){
+                               return localDeleteNetworkInterfaceResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteNetworkInterfaceResponse
+                               */
+                               public void setDeleteNetworkInterfaceResponse(com.amazon.ec2.DeleteNetworkInterfaceResponseType param){
+                            
+                                            this.localDeleteNetworkInterfaceResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkInterfaceResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteNetworkInterfaceResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteNetworkInterfaceResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteNetworkInterfaceResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkInterfaceResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkInterfaceResponse object =
+                new DeleteNetworkInterfaceResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteNetworkInterfaceResponse").equals(reader.getName())){
+                                
+                                                object.setDeleteNetworkInterfaceResponse(com.amazon.ec2.DeleteNetworkInterfaceResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[09/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
new file mode 100644
index 0000000..2f15d3c
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * DeleteNetworkInterfaceResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkInterfaceResponseType bean class
+            */
+        
+        public  class DeleteNetworkInterfaceResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteNetworkInterfaceResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkInterfaceResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteNetworkInterfaceResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteNetworkInterfaceResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkInterfaceResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkInterfaceResponseType object =
+                new DeleteNetworkInterfaceResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteNetworkInterfaceResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteNetworkInterfaceResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
new file mode 100644
index 0000000..adbe557
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
@@ -0,0 +1,483 @@
+
+/**
+ * DeleteNetworkInterfaceType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkInterfaceType bean class
+            */
+        
+        public  class DeleteNetworkInterfaceType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteNetworkInterfaceType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for NetworkInterfaceId
+                        */
+
+                        
+                                    protected java.lang.String localNetworkInterfaceId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getNetworkInterfaceId(){
+                               return localNetworkInterfaceId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkInterfaceId
+                               */
+                               public void setNetworkInterfaceId(java.lang.String param){
+                            
+                                            this.localNetworkInterfaceId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkInterfaceType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteNetworkInterfaceType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteNetworkInterfaceType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"networkInterfaceId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"networkInterfaceId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("networkInterfaceId");
+                                    }
+                                
+
+                                          if (localNetworkInterfaceId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localNetworkInterfaceId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkInterfaceId"));
+                                 
+                                        if (localNetworkInterfaceId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNetworkInterfaceId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkInterfaceType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkInterfaceType object =
+                new DeleteNetworkInterfaceType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteNetworkInterfaceType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteNetworkInterfaceType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkInterfaceId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setNetworkInterfaceId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
index 6bf3aab..5068ae2 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeletePlacementGroup.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeletePlacementGroup",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeletePlacementGroup").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeletePlacementGroup").equals(reader.getName())){
                                 
                                                 object.setDeletePlacementGroup(com.amazon.ec2.DeletePlacementGroupType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
index 43cc6f6..87faa18 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeletePlacementGroupResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeletePlacementGroupResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeletePlacementGroupResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeletePlacementGroupResponse").equals(reader.getName())){
                                 
                                                 object.setDeletePlacementGroupResponse(com.amazon.ec2.DeletePlacementGroupResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
index e966f40..1efb7d2 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeletePlacementGroupResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeletePlacementGroupResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeletePlacementGroupResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
index 212555d..f795d58 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeletePlacementGroupType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeletePlacementGroupType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeletePlacementGroupType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "groupName"));
                                  
                                         if (localGroupName != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","groupName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRoute.java b/awsapi/src/com/amazon/ec2/DeleteRoute.java
new file mode 100644
index 0000000..6aa8a05
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteRoute.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteRoute.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteRoute bean class
+            */
+        
+        public  class DeleteRoute
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteRoute",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteRoute
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteRouteType localDeleteRoute ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteRouteType
+                           */
+                           public  com.amazon.ec2.DeleteRouteType getDeleteRoute(){
+                               return localDeleteRoute;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteRoute
+                               */
+                               public void setDeleteRoute(com.amazon.ec2.DeleteRouteType param){
+                            
+                                            this.localDeleteRoute=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteRoute.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteRoute==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteRoute.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteRoute.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteRoute parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteRoute object =
+                new DeleteRoute();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteRoute").equals(reader.getName())){
+                                
+                                                object.setDeleteRoute(com.amazon.ec2.DeleteRouteType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[46/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
index 6b116f0..f0081e9 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AmazonEC2Skeleton.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:00 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:00:16 CEST)
  */
     package com.amazon.ec2;
     /**
@@ -31,220 +15,300 @@
         /**
          * Auto generated method signature
          * 
-                                     * @param registerImage0
+                                     * @param describePlacementGroups0
          */
         
-                 public com.amazon.ec2.RegisterImageResponse registerImage
+                 public com.amazon.ec2.DescribePlacementGroupsResponse describePlacementGroups
                   (
-                  com.amazon.ec2.RegisterImage registerImage0
+                  com.amazon.ec2.DescribePlacementGroups describePlacementGroups0
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#registerImage");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describePlacementGroups");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param deleteTags2
+                                     * @param createSecurityGroup2
          */
         
-                 public com.amazon.ec2.DeleteTagsResponse deleteTags
+                 public com.amazon.ec2.CreateSecurityGroupResponse createSecurityGroup
                   (
-                  com.amazon.ec2.DeleteTags deleteTags2
+                  com.amazon.ec2.CreateSecurityGroup createSecurityGroup2
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteTags");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSecurityGroup");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param createKeyPair4
+                                     * @param resetNetworkInterfaceAttribute4
          */
         
-                 public com.amazon.ec2.CreateKeyPairResponse createKeyPair
+                 public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute
                   (
-                  com.amazon.ec2.CreateKeyPair createKeyPair4
+                  com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createKeyPair");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#resetNetworkInterfaceAttribute");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param terminateInstances6
+                                     * @param createDhcpOptions6
          */
         
-                 public com.amazon.ec2.TerminateInstancesResponse terminateInstances
+                 public com.amazon.ec2.CreateDhcpOptionsResponse createDhcpOptions
                   (
-                  com.amazon.ec2.TerminateInstances terminateInstances6
+                  com.amazon.ec2.CreateDhcpOptions createDhcpOptions6
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#terminateInstances");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createDhcpOptions");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeImageAttribute8
+                                     * @param createRouteTable8
          */
         
-                 public com.amazon.ec2.DescribeImageAttributeResponse describeImageAttribute
+                 public com.amazon.ec2.CreateRouteTableResponse createRouteTable
                   (
-                  com.amazon.ec2.DescribeImageAttribute describeImageAttribute8
+                  com.amazon.ec2.CreateRouteTable createRouteTable8
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeImageAttribute");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createRouteTable");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeSecurityGroups10
+                                     * @param describeSubnets10
          */
         
-                 public com.amazon.ec2.DescribeSecurityGroupsResponse describeSecurityGroups
+                 public com.amazon.ec2.DescribeSubnetsResponse describeSubnets
                   (
-                  com.amazon.ec2.DescribeSecurityGroups describeSecurityGroups10
+                  com.amazon.ec2.DescribeSubnets describeSubnets10
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSecurityGroups");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSubnets");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describePlacementGroups12
+                                     * @param deactivateLicense12
          */
         
-                 public com.amazon.ec2.DescribePlacementGroupsResponse describePlacementGroups
+                 public com.amazon.ec2.DeactivateLicenseResponse deactivateLicense
                   (
-                  com.amazon.ec2.DescribePlacementGroups describePlacementGroups12
+                  com.amazon.ec2.DeactivateLicense deactivateLicense12
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describePlacementGroups");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deactivateLicense");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param createVpnConnection14
+                                     * @param deleteVpc14
          */
         
-                 public com.amazon.ec2.CreateVpnConnectionResponse createVpnConnection
+                 public com.amazon.ec2.DeleteVpcResponse deleteVpc
                   (
-                  com.amazon.ec2.CreateVpnConnection createVpnConnection14
+                  com.amazon.ec2.DeleteVpc deleteVpc14
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createVpnConnection");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVpc");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param attachVpnGateway16
+                                     * @param cancelSpotInstanceRequests16
          */
         
-                 public com.amazon.ec2.AttachVpnGatewayResponse attachVpnGateway
+                 public com.amazon.ec2.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequests
                   (
-                  com.amazon.ec2.AttachVpnGateway attachVpnGateway16
+                  com.amazon.ec2.CancelSpotInstanceRequests cancelSpotInstanceRequests16
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#attachVpnGateway");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelSpotInstanceRequests");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param createVolume18
+                                     * @param createSubnet18
          */
         
-                 public com.amazon.ec2.CreateVolumeResponse createVolume
+                 public com.amazon.ec2.CreateSubnetResponse createSubnet
                   (
-                  com.amazon.ec2.CreateVolume createVolume18
+                  com.amazon.ec2.CreateSubnet createSubnet18
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createVolume");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSubnet");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param releaseAddress20
+                                     * @param deleteVpnGateway20
          */
         
-                 public com.amazon.ec2.ReleaseAddressResponse releaseAddress
+                 public com.amazon.ec2.DeleteVpnGatewayResponse deleteVpnGateway
                   (
-                  com.amazon.ec2.ReleaseAddress releaseAddress20
+                  com.amazon.ec2.DeleteVpnGateway deleteVpnGateway20
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#releaseAddress");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVpnGateway");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeRegions22
+                                     * @param createNetworkAclEntry22
          */
         
-                 public com.amazon.ec2.DescribeRegionsResponse describeRegions
+                 public com.amazon.ec2.CreateNetworkAclEntryResponse createNetworkAclEntry
                   (
-                  com.amazon.ec2.DescribeRegions describeRegions22
+                  com.amazon.ec2.CreateNetworkAclEntry createNetworkAclEntry22
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeRegions");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createNetworkAclEntry");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param deleteSubnet24
+                                     * @param requestSpotInstances24
          */
         
-                 public com.amazon.ec2.DeleteSubnetResponse deleteSubnet
+                 public com.amazon.ec2.RequestSpotInstancesResponse requestSpotInstances
                   (
-                  com.amazon.ec2.DeleteSubnet deleteSubnet24
+                  com.amazon.ec2.RequestSpotInstances requestSpotInstances24
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSubnet");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#requestSpotInstances");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeVolumeAttribute26
+         */
+        
+                 public com.amazon.ec2.DescribeVolumeAttributeResponse describeVolumeAttribute
+                  (
+                  com.amazon.ec2.DescribeVolumeAttribute describeVolumeAttribute26
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeVolumeAttribute");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param associateDhcpOptions28
+         */
+        
+                 public com.amazon.ec2.AssociateDhcpOptionsResponse associateDhcpOptions
+                  (
+                  com.amazon.ec2.AssociateDhcpOptions associateDhcpOptions28
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#associateDhcpOptions");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeTags30
+         */
+        
+                 public com.amazon.ec2.DescribeTagsResponse describeTags
+                  (
+                  com.amazon.ec2.DescribeTags describeTags30
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeTags");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param importKeyPair32
+         */
+        
+                 public com.amazon.ec2.ImportKeyPairResponse importKeyPair
+                  (
+                  com.amazon.ec2.ImportKeyPair importKeyPair32
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#importKeyPair");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param deleteNetworkInterface34
+         */
+        
+                 public com.amazon.ec2.DeleteNetworkInterfaceResponse deleteNetworkInterface
+                  (
+                  com.amazon.ec2.DeleteNetworkInterface deleteNetworkInterface34
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteNetworkInterface");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeVpcs26
+                                     * @param describeVpcs36
          */
         
                  public com.amazon.ec2.DescribeVpcsResponse describeVpcs
                   (
-                  com.amazon.ec2.DescribeVpcs describeVpcs26
+                  com.amazon.ec2.DescribeVpcs describeVpcs36
                   )
             {
                 //TODO : fill this with the necessary business logic
@@ -255,1296 +319,2000 @@
         /**
          * Auto generated method signature
          * 
-                                     * @param describeSpotPriceHistory28
+                                     * @param describeLicenses38
          */
         
-                 public com.amazon.ec2.DescribeSpotPriceHistoryResponse describeSpotPriceHistory
+                 public com.amazon.ec2.DescribeLicensesResponse describeLicenses
+                  (
+                  com.amazon.ec2.DescribeLicenses describeLicenses38
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeLicenses");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param bundleInstance40
+         */
+        
+                 public com.amazon.ec2.BundleInstanceResponse bundleInstance
+                  (
+                  com.amazon.ec2.BundleInstance bundleInstance40
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#bundleInstance");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeVpnConnections42
+         */
+        
+                 public com.amazon.ec2.DescribeVpnConnectionsResponse describeVpnConnections
+                  (
+                  com.amazon.ec2.DescribeVpnConnections describeVpnConnections42
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeVpnConnections");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeImages44
+         */
+        
+                 public com.amazon.ec2.DescribeImagesResponse describeImages
+                  (
+                  com.amazon.ec2.DescribeImages describeImages44
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeImages");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param createInternetGateway46
+         */
+        
+                 public com.amazon.ec2.CreateInternetGatewayResponse createInternetGateway
+                  (
+                  com.amazon.ec2.CreateInternetGateway createInternetGateway46
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createInternetGateway");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param disassociateRouteTable48
+         */
+        
+                 public com.amazon.ec2.DisassociateRouteTableResponse disassociateRouteTable
+                  (
+                  com.amazon.ec2.DisassociateRouteTable disassociateRouteTable48
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#disassociateRouteTable");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param replaceNetworkAclEntry50
+         */
+        
+                 public com.amazon.ec2.ReplaceNetworkAclEntryResponse replaceNetworkAclEntry
+                  (
+                  com.amazon.ec2.ReplaceNetworkAclEntry replaceNetworkAclEntry50
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#replaceNetworkAclEntry");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param authorizeSecurityGroupIngress52
+         */
+        
+                 public com.amazon.ec2.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngress
+                  (
+                  com.amazon.ec2.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress52
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#authorizeSecurityGroupIngress");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeSnapshotAttribute54
+         */
+        
+                 public com.amazon.ec2.DescribeSnapshotAttributeResponse describeSnapshotAttribute
+                  (
+                  com.amazon.ec2.DescribeSnapshotAttribute describeSnapshotAttribute54
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSnapshotAttribute");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param createVpnGateway56
+         */
+        
+                 public com.amazon.ec2.CreateVpnGatewayResponse createVpnGateway
+                  (
+                  com.amazon.ec2.CreateVpnGateway createVpnGateway56
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createVpnGateway");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param resetInstanceAttribute58
+         */
+        
+                 public com.amazon.ec2.ResetInstanceAttributeResponse resetInstanceAttribute
+                  (
+                  com.amazon.ec2.ResetInstanceAttribute resetInstanceAttribute58
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#resetInstanceAttribute");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param createTags60
+         */
+        
+                 public com.amazon.ec2.CreateTagsResponse createTags
+                  (
+                  com.amazon.ec2.CreateTags createTags60
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createTags");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param authorizeSecurityGroupEgress62
+         */
+        
+                 public com.amazon.ec2.AuthorizeSecurityGroupEgressResponse authorizeSecurityGroupEgress
+                  (
+                  com.amazon.ec2.AuthorizeSecurityGroupEgress authorizeSecurityGroupEgress62
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#authorizeSecurityGroupEgress");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param associateAddress64
+         */
+        
+                 public com.amazon.ec2.AssociateAddressResponse associateAddress
+                  (
+                  com.amazon.ec2.AssociateAddress associateAddress64
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#associateAddress");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeImageAttribute66
+         */
+        
+                 public com.amazon.ec2.DescribeImageAttributeResponse describeImageAttribute
+                  (
+                  com.amazon.ec2.DescribeImageAttribute describeImageAttribute66
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeImageAttribute");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeSpotPriceHistory68
+         */
+        
+                 public com.amazon.ec2.DescribeSpotPriceHistoryResponse describeSpotPriceHistory
+                  (
+                  com.amazon.ec2.DescribeSpotPriceHistory describeSpotPriceHistory68
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSpotPriceHistory");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param modifySnapshotAttribute70
+         */
+        
+                 public com.amazon.ec2.ModifySnapshotAttributeResponse modifySnapshotAttribute
+                  (
+                  com.amazon.ec2.ModifySnapshotAttribute modifySnapshotAttribute70
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#modifySnapshotAttribute");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeSpotInstanceRequests72
+         */
+        
+                 public com.amazon.ec2.DescribeSpotInstanceRequestsResponse describeSpotInstanceRequests
+                  (
+                  com.amazon.ec2.DescribeSpotInstanceRequests describeSpotInstanceRequests72
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSpotInstanceRequests");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param importInstance74
+         */
+        
+                 public com.amazon.ec2.ImportInstanceResponse importInstance
+                  (
+                  com.amazon.ec2.ImportInstance importInstance74
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#importInstance");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeKeyPairs76
+         */
+        
+                 public com.amazon.ec2.DescribeKeyPairsResponse describeKeyPairs
+                  (
+                  com.amazon.ec2.DescribeKeyPairs describeKeyPairs76
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeKeyPairs");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param revokeSecurityGroupIngress78
+         */
+        
+                 public com.amazon.ec2.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngress
+                  (
+                  com.amazon.ec2.RevokeSecurityGroupIngress revokeSecurityGroupIngress78
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#revokeSecurityGroupIngress");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param createPlacementGroup80
+         */
+        
+                 public com.amazon.ec2.CreatePlacementGroupResponse createPlacementGroup
+                  (
+                  com.amazon.ec2.CreatePlacementGroup createPlacementGroup80
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createPlacementGroup");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param deleteNetworkAclEntry82
+         */
+        
+                 public com.amazon.ec2.DeleteNetworkAclEntryResponse deleteNetworkAclEntry
+                  (
+                  com.amazon.ec2.DeleteNetworkAclEntry deleteNetworkAclEntry82
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteNetworkAclEntry");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param activateLicense84
+         */
+        
+                 public com.amazon.ec2.ActivateLicenseResponse activateLicense
+                  (
+                  com.amazon.ec2.ActivateLicense activateLicense84
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#activateLicense");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param deleteRouteTable86
+         */
+        
+                 public com.amazon.ec2.DeleteRouteTableResponse deleteRouteTable
+                  (
+                  com.amazon.ec2.DeleteRouteTable deleteRouteTable86
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteRouteTable");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param unmonitorInstances88
+         */
+        
+                 public com.amazon.ec2.UnmonitorInstancesResponse unmonitorInstances
+                  (
+                  com.amazon.ec2.UnmonitorInstances unmonitorInstances88
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#unmonitorInstances");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param startInstances90
+         */
+        
+                 public com.amazon.ec2.StartInstancesResponse startInstances
+                  (
+                  com.amazon.ec2.StartInstances startInstances90
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#startInstances");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param confirmProductInstance92
+         */
+        
+                 public com.amazon.ec2.ConfirmProductInstanceResponse confirmProductInstance
+                  (
+                  com.amazon.ec2.ConfirmProductInstance confirmProductInstance92
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#confirmProductInstance");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeNetworkInterfaceAttribute94
+         */
+        
+                 public com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse describeNetworkInterfaceAttribute
+                  (
+                  com.amazon.ec2.DescribeNetworkInterfaceAttribute describeNetworkInterfaceAttribute94
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeNetworkInterfaceAttribute");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param runInstances96
+         */
+        
+                 public com.amazon.ec2.RunInstancesResponse runInstances
+                  (
+                  com.amazon.ec2.RunInstances runInstances96
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#runInstances");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param createReservedInstancesListing98
+         */
+        
+                 public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing
+                  (
+                  com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing98
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createReservedInstancesListing");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param createCustomerGateway100
+         */
+        
+                 public com.amazon.ec2.CreateCustomerGatewayResponse createCustomerGateway
+                  (
+                  com.amazon.ec2.CreateCustomerGateway createCustomerGateway100
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createCustomerGateway");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param createNetworkAcl102
+         */
+        
+                 public com.amazon.ec2.CreateNetworkAclResponse createNetworkAcl
+                  (
+                  com.amazon.ec2.CreateNetworkAcl createNetworkAcl102
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createNetworkAcl");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param resetImageAttribute104
+         */
+        
+                 public com.amazon.ec2.ResetImageAttributeResponse resetImageAttribute
+                  (
+                  com.amazon.ec2.ResetImageAttribute resetImageAttribute104
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#resetImageAttribute");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param modifyVolumeAttribute106
+         */
+        
+                 public com.amazon.ec2.ModifyVolumeAttributeResponse modifyVolumeAttribute
+                  (
+                  com.amazon.ec2.ModifyVolumeAttribute modifyVolumeAttribute106
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#modifyVolumeAttribute");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeReservedInstances108
+         */
+        
+                 public com.amazon.ec2.DescribeReservedInstancesResponse describeReservedInstances
+                  (
+                  com.amazon.ec2.DescribeReservedInstances describeReservedInstances108
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeReservedInstances");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param resetSnapshotAttribute110
+         */
+        
+                 public com.amazon.ec2.ResetSnapshotAttributeResponse resetSnapshotAttribute
+                  (
+                  com.amazon.ec2.ResetSnapshotAttribute resetSnapshotAttribute110
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#resetSnapshotAttribute");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param deleteVolume112
+         */
+        
+                 public com.amazon.ec2.DeleteVolumeResponse deleteVolume
+                  (
+                  com.amazon.ec2.DeleteVolume deleteVolume112
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVolume");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeAvailabilityZones114
+         */
+        
+                 public com.amazon.ec2.DescribeAvailabilityZonesResponse describeAvailabilityZones
+                  (
+                  com.amazon.ec2.DescribeAvailabilityZones describeAvailabilityZones114
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeAvailabilityZones");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param createVpnConnection116
+         */
+        
+                 public com.amazon.ec2.CreateVpnConnectionResponse createVpnConnection
+                  (
+                  com.amazon.ec2.CreateVpnConnection createVpnConnection116
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createVpnConnection");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param cancelBundleTask118
+         */
+        
+                 public com.amazon.ec2.CancelBundleTaskResponse cancelBundleTask
+                  (
+                  com.amazon.ec2.CancelBundleTask cancelBundleTask118
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelBundleTask");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param replaceNetworkAclAssociation120
+         */
+        
+                 public com.amazon.ec2.ReplaceNetworkAclAssociationResponse replaceNetworkAclAssociation
+                  (
+                  com.amazon.ec2.ReplaceNetworkAclAssociation replaceNetworkAclAssociation120
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#replaceNetworkAclAssociation");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param detachVpnGateway122
+         */
+        
+                 public com.amazon.ec2.DetachVpnGatewayResponse detachVpnGateway
+                  (
+                  com.amazon.ec2.DetachVpnGateway detachVpnGateway122
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#detachVpnGateway");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param describeSnapshots124
+         */
+        
+                 public com.amazon.ec2.DescribeSnapshotsResponse describeSnapshots
+                  (
+                  com.amazon.ec2.DescribeSnapshots describeSnapshots124
+                  )
+            {
+                //TODO : fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSnapshots");
+        }
+     
+         
+        /**
+         * Auto generated method signature
+         * 
+                                     * @param deleteSubnet126
+         */
+        
+                 public com.amazon.ec2.DeleteSubnetResponse deleteSubnet
                   (
-                  com.amazon.ec2.DescribeSpotPriceHistory describeSpotPriceHistory28
+                  com.amazon.ec2.DeleteSubnet deleteSubnet126
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSpotPriceHistory");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSubnet");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeReservedInstances30
+                                     * @param describeBundleTasks128
          */
         
-                 public com.amazon.ec2.DescribeReservedInstancesResponse describeReservedInstances
+                 public com.amazon.ec2.DescribeBundleTasksResponse describeBundleTasks
                   (
-                  com.amazon.ec2.DescribeReservedInstances describeReservedInstances30
+                  com.amazon.ec2.DescribeBundleTasks describeBundleTasks128
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeReservedInstances");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeBundleTasks");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeTags32
+                                     * @param createKeyPair130
          */
         
-                 public com.amazon.ec2.DescribeTagsResponse describeTags
+                 public com.amazon.ec2.CreateKeyPairResponse createKeyPair
                   (
-                  com.amazon.ec2.DescribeTags describeTags32
+                  com.amazon.ec2.CreateKeyPair createKeyPair130
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeTags");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createKeyPair");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param importVolume34
+                                     * @param createImage132
          */
         
-                 public com.amazon.ec2.ImportVolumeResponse importVolume
+                 public com.amazon.ec2.CreateImageResponse createImage
                   (
-                  com.amazon.ec2.ImportVolume importVolume34
+                  com.amazon.ec2.CreateImage createImage132
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#importVolume");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createImage");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeSpotDatafeedSubscription36
+                                     * @param enableVgwRoutePropagation134
          */
         
-                 public com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscription
+                 public com.amazon.ec2.EnableVgwRoutePropagationResponse enableVgwRoutePropagation
                   (
-                  com.amazon.ec2.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription36
+                  com.amazon.ec2.EnableVgwRoutePropagation enableVgwRoutePropagation134
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSpotDatafeedSubscription");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#enableVgwRoutePropagation");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param deactivateLicense38
+                                     * @param unassignPrivateIpAddresses136
          */
         
-                 public com.amazon.ec2.DeactivateLicenseResponse deactivateLicense
+                 public com.amazon.ec2.UnassignPrivateIpAddressesResponse unassignPrivateIpAddresses
                   (
-                  com.amazon.ec2.DeactivateLicense deactivateLicense38
+                  com.amazon.ec2.UnassignPrivateIpAddresses unassignPrivateIpAddresses136
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deactivateLicense");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#unassignPrivateIpAddresses");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param detachVolume40
+                                     * @param deregisterImage138
          */
         
-                 public com.amazon.ec2.DetachVolumeResponse detachVolume
+                 public com.amazon.ec2.DeregisterImageResponse deregisterImage
                   (
-                  com.amazon.ec2.DetachVolume detachVolume40
+                  com.amazon.ec2.DeregisterImage deregisterImage138
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#detachVolume");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deregisterImage");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeReservedInstancesOfferings42
+                                     * @param deleteVpnConnectionRoute140
          */
         
-                 public com.amazon.ec2.DescribeReservedInstancesOfferingsResponse describeReservedInstancesOfferings
+                 public com.amazon.ec2.DeleteVpnConnectionRouteResponse deleteVpnConnectionRoute
                   (
-                  com.amazon.ec2.DescribeReservedInstancesOfferings describeReservedInstancesOfferings42
+                  com.amazon.ec2.DeleteVpnConnectionRoute deleteVpnConnectionRoute140
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeReservedInstancesOfferings");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVpnConnectionRoute");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeConversionTasks44
+                                     * @param modifyImageAttribute142
          */
         
-                 public com.amazon.ec2.DescribeConversionTasksResponse describeConversionTasks
+                 public com.amazon.ec2.ModifyImageAttributeResponse modifyImageAttribute
                   (
-                  com.amazon.ec2.DescribeConversionTasks describeConversionTasks44
+                  com.amazon.ec2.ModifyImageAttribute modifyImageAttribute142
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeConversionTasks");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#modifyImageAttribute");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param deleteCustomerGateway46
+                                     * @param cancelConversionTask144
          */
         
-                 public com.amazon.ec2.DeleteCustomerGatewayResponse deleteCustomerGateway
+                 public com.amazon.ec2.CancelConversionTaskResponse cancelConversionTask
                   (
-                  com.amazon.ec2.DeleteCustomerGateway deleteCustomerGateway46
+                  com.amazon.ec2.CancelConversionTask cancelConversionTask144
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteCustomerGateway");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelConversionTask");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param deletePlacementGroup48
+                                     * @param describeVolumes146
          */
         
-                 public com.amazon.ec2.DeletePlacementGroupResponse deletePlacementGroup
+                 public com.amazon.ec2.DescribeVolumesResponse describeVolumes
                   (
-                  com.amazon.ec2.DeletePlacementGroup deletePlacementGroup48
+                  com.amazon.ec2.DescribeVolumes describeVolumes146
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deletePlacementGroup");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeVolumes");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param requestSpotInstances50
+                                     * @param cancelReservedInstancesListing148
          */
         
-                 public com.amazon.ec2.RequestSpotInstancesResponse requestSpotInstances
+                 public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing
                   (
-                  com.amazon.ec2.RequestSpotInstances requestSpotInstances50
+                  com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing148
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#requestSpotInstances");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelReservedInstancesListing");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param confirmProductInstance52
+                                     * @param getPasswordData150
          */
         
-                 public com.amazon.ec2.ConfirmProductInstanceResponse confirmProductInstance
+                 public com.amazon.ec2.GetPasswordDataResponse getPasswordData
                   (
-                  com.amazon.ec2.ConfirmProductInstance confirmProductInstance52
+                  com.amazon.ec2.GetPasswordData getPasswordData150
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#confirmProductInstance");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#getPasswordData");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param modifySnapshotAttribute54
+                                     * @param allocateAddress152
          */
         
-                 public com.amazon.ec2.ModifySnapshotAttributeResponse modifySnapshotAttribute
+                 public com.amazon.ec2.AllocateAddressResponse allocateAddress
                   (
-                  com.amazon.ec2.ModifySnapshotAttribute modifySnapshotAttribute54
+                  com.amazon.ec2.AllocateAddress allocateAddress152
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#modifySnapshotAttribute");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#allocateAddress");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param purchaseReservedInstancesOffering56
+                                     * @param deleteSecurityGroup154
          */
         
-                 public com.amazon.ec2.PurchaseReservedInstancesOfferingResponse purchaseReservedInstancesOffering
+                 public com.amazon.ec2.DeleteSecurityGroupResponse deleteSecurityGroup
                   (
-                  com.amazon.ec2.PurchaseReservedInstancesOffering purchaseReservedInstancesOffering56
+                  com.amazon.ec2.DeleteSecurityGroup deleteSecurityGroup154
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#purchaseReservedInstancesOffering");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSecurityGroup");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param cancelConversionTask58
+                                     * @param deletePlacementGroup156
          */
         
-                 public com.amazon.ec2.CancelConversionTaskResponse cancelConversionTask
+                 public com.amazon.ec2.DeletePlacementGroupResponse deletePlacementGroup
                   (
-                  com.amazon.ec2.CancelConversionTask cancelConversionTask58
+                  com.amazon.ec2.DeletePlacementGroup deletePlacementGroup156
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelConversionTask");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deletePlacementGroup");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param deleteVpnConnection60
+                                     * @param disassociateAddress158
          */
         
-                 public com.amazon.ec2.DeleteVpnConnectionResponse deleteVpnConnection
+                 public com.amazon.ec2.DisassociateAddressResponse disassociateAddress
                   (
-                  com.amazon.ec2.DeleteVpnConnection deleteVpnConnection60
+                  com.amazon.ec2.DisassociateAddress disassociateAddress158
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVpnConnection");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#disassociateAddress");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param detachVpnGateway62
+                                     * @param deleteDhcpOptions160
          */
         
-                 public com.amazon.ec2.DetachVpnGatewayResponse detachVpnGateway
+                 public com.amazon.ec2.DeleteDhcpOptionsResponse deleteDhcpOptions
                   (
-                  com.amazon.ec2.DetachVpnGateway detachVpnGateway62
+                  com.amazon.ec2.DeleteDhcpOptions deleteDhcpOptions160
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#detachVpnGateway");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteDhcpOptions");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeCustomerGateways64
+                                     * @param describeSpotDatafeedSubscription162
          */
         
-                 public com.amazon.ec2.DescribeCustomerGatewaysResponse describeCustomerGateways
+                 public com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscription
                   (
-                  com.amazon.ec2.DescribeCustomerGateways describeCustomerGateways64
+                  com.amazon.ec2.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription162
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeCustomerGateways");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSpotDatafeedSubscription");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeLicenses66
+                                     * @param describeNetworkAcls164
          */
         
-                 public com.amazon.ec2.DescribeLicensesResponse describeLicenses
+                 public com.amazon.ec2.DescribeNetworkAclsResponse describeNetworkAcls
                   (
-                  com.amazon.ec2.DescribeLicenses describeLicenses66
+                  com.amazon.ec2.DescribeNetworkAcls describeNetworkAcls164
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeLicenses");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeNetworkAcls");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param revokeSecurityGroupIngress68
+                                     * @param enableVolumeIO166
          */
         
-                 public com.amazon.ec2.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngress
+                 public com.amazon.ec2.EnableVolumeIOResponse enableVolumeIO
                   (
-                  com.amazon.ec2.RevokeSecurityGroupIngress revokeSecurityGroupIngress68
+                  com.amazon.ec2.EnableVolumeIO enableVolumeIO166
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#revokeSecurityGroupIngress");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#enableVolumeIO");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeSubnets70
+                                     * @param attachVpnGateway168
          */
         
-                 public com.amazon.ec2.DescribeSubnetsResponse describeSubnets
+                 public com.amazon.ec2.AttachVpnGatewayResponse attachVpnGateway
                   (
-                  com.amazon.ec2.DescribeSubnets describeSubnets70
+                  com.amazon.ec2.AttachVpnGateway attachVpnGateway168
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSubnets");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#attachVpnGateway");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param resetSnapshotAttribute72
+                                     * @param describeInternetGateways170
          */
         
-                 public com.amazon.ec2.ResetSnapshotAttributeResponse resetSnapshotAttribute
+                 public com.amazon.ec2.DescribeInternetGatewaysResponse describeInternetGateways
                   (
-                  com.amazon.ec2.ResetSnapshotAttribute resetSnapshotAttribute72
+                  com.amazon.ec2.DescribeInternetGateways describeInternetGateways170
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#resetSnapshotAttribute");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeInternetGateways");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeAddresses74
+                                     * @param describeDhcpOptions172
          */
         
-                 public com.amazon.ec2.DescribeAddressesResponse describeAddresses
+                 public com.amazon.ec2.DescribeDhcpOptionsResponse describeDhcpOptions
                   (
-                  com.amazon.ec2.DescribeAddresses describeAddresses74
+                  com.amazon.ec2.DescribeDhcpOptions describeDhcpOptions172
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeAddresses");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeDhcpOptions");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param createSecurityGroup76
+                                     * @param createSpotDatafeedSubscription174
          */
         
-                 public com.amazon.ec2.CreateSecurityGroupResponse createSecurityGroup
+                 public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription
                   (
-                  com.amazon.ec2.CreateSecurityGroup createSecurityGroup76
+                  com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription174
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSecurityGroup");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSpotDatafeedSubscription");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param allocateAddress78
+                                     * @param describeReservedInstancesListings176
          */
         
-                 public com.amazon.ec2.AllocateAddressResponse allocateAddress
+                 public com.amazon.ec2.DescribeReservedInstancesListingsResponse describeReservedInstancesListings
                   (
-                  com.amazon.ec2.AllocateAddress allocateAddress78
+                  com.amazon.ec2.DescribeReservedInstancesListings describeReservedInstancesListings176
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#allocateAddress");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeReservedInstancesListings");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param importKeyPair80
+                                     * @param describeInstanceStatus178
          */
         
-                 public com.amazon.ec2.ImportKeyPairResponse importKeyPair
+                 public com.amazon.ec2.DescribeInstanceStatusResponse describeInstanceStatus
                   (
-                  com.amazon.ec2.ImportKeyPair importKeyPair80
+                  com.amazon.ec2.DescribeInstanceStatus describeInstanceStatus178
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#importKeyPair");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeInstanceStatus");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param createTags82
+                                     * @param modifyNetworkInterfaceAttribute180
          */
         
-                 public com.amazon.ec2.CreateTagsResponse createTags
+                 public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute
                   (
-                  com.amazon.ec2.CreateTags createTags82
+                  com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute180
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createTags");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#modifyNetworkInterfaceAttribute");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param startInstances84
+                                     * @param disableVgwRoutePropagation182
          */
         
-                 public com.amazon.ec2.StartInstancesResponse startInstances
+                 public com.amazon.ec2.DisableVgwRoutePropagationResponse disableVgwRoutePropagation
                   (
-                  com.amazon.ec2.StartInstances startInstances84
+                  com.amazon.ec2.DisableVgwRoutePropagation disableVgwRoutePropagation182
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#startInstances");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#disableVgwRoutePropagation");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeVpnConnections86
+                                     * @param describeVolumeStatus184
          */
         
-                 public com.amazon.ec2.DescribeVpnConnectionsResponse describeVpnConnections
+                 public com.amazon.ec2.DescribeVolumeStatusResponse describeVolumeStatus
                   (
-                  com.amazon.ec2.DescribeVpnConnections describeVpnConnections86
+                  com.amazon.ec2.DescribeVolumeStatus describeVolumeStatus184
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeVpnConnections");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeVolumeStatus");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param rebootInstances88
+                                     * @param detachNetworkInterface186
          */
         
-                 public com.amazon.ec2.RebootInstancesResponse rebootInstances
+                 public com.amazon.ec2.DetachNetworkInterfaceResponse detachNetworkInterface
                   (
-                  com.amazon.ec2.RebootInstances rebootInstances88
+                  com.amazon.ec2.DetachNetworkInterface detachNetworkInterface186
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#rebootInstances");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#detachNetworkInterface");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeAvailabilityZones90
+                                     * @param describeSecurityGroups188
          */
         
-                 public com.amazon.ec2.DescribeAvailabilityZonesResponse describeAvailabilityZones
+                 public com.amazon.ec2.DescribeSecurityGroupsResponse describeSecurityGroups
                   (
-                  com.amazon.ec2.DescribeAvailabilityZones describeAvailabilityZones90
+                  com.amazon.ec2.DescribeSecurityGroups describeSecurityGroups188
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeAvailabilityZones");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSecurityGroups");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param bundleInstance92
+                                     * @param describeInstances190
          */
         
-                 public com.amazon.ec2.BundleInstanceResponse bundleInstance
+                 public com.amazon.ec2.DescribeInstancesResponse describeInstances
                   (
-                  com.amazon.ec2.BundleInstance bundleInstance92
+                  com.amazon.ec2.DescribeInstances describeInstances190
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#bundleInstance");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeInstances");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param activateLicense94
+                                     * @param describeNetworkInterfaces192
          */
         
-                 public com.amazon.ec2.ActivateLicenseResponse activateLicense
+                 public com.amazon.ec2.DescribeNetworkInterfacesResponse describeNetworkInterfaces
                   (
-                  com.amazon.ec2.ActivateLicense activateLicense94
+                  com.amazon.ec2.DescribeNetworkInterfaces describeNetworkInterfaces192
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#activateLicense");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeNetworkInterfaces");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeSnapshots96
+                                     * @param deleteKeyPair194
          */
         
-                 public com.amazon.ec2.DescribeSnapshotsResponse describeSnapshots
+                 public com.amazon.ec2.DeleteKeyPairResponse deleteKeyPair
                   (
-                  com.amazon.ec2.DescribeSnapshots describeSnapshots96
+                  com.amazon.ec2.DeleteKeyPair deleteKeyPair194
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSnapshots");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteKeyPair");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param createPlacementGroup98
+                                     * @param createSnapshot196
          */
         
-                 public com.amazon.ec2.CreatePlacementGroupResponse createPlacementGroup
+                 public com.amazon.ec2.CreateSnapshotResponse createSnapshot
                   (
-                  com.amazon.ec2.CreatePlacementGroup createPlacementGroup98
+                  com.amazon.ec2.CreateSnapshot createSnapshot196
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createPlacementGroup");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSnapshot");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param describeSpotInstanceRequests100
+                                     * @param describeVpnGateways198
          */
         
-                 public com.amazon.ec2.DescribeSpotInstanceRequestsResponse describeSpotInstanceRequests
+                 public com.amazon.ec2.DescribeVpnGatewaysResponse describeVpnGateways
                   (
-                  com.amazon.ec2.DescribeSpotInstanceRequests describeSpotInstanceRequests100
+                  com.amazon.ec2.DescribeVpnGateways describeVpnGateways198
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSpotInstanceRequests");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeVpnGateways");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param associateAddress102
+                                     * @param deleteTags200
          */
         
-                 public com.amazon.ec2.AssociateAddressResponse associateAddress
+                 public com.amazon.ec2.DeleteTagsResponse deleteTags
                   (
-                  com.amazon.ec2.AssociateAddress associateAddress102
+                  com.amazon.ec2.DeleteTags deleteTags200
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#associateAddress");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteTags");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param runInstances104
+                                     * @param deleteSnapshot202
          */
         
-                 public com.amazon.ec2.RunInstancesResponse runInstances
+                 public com.amazon.ec2.DeleteSnapshotResponse deleteSnapshot
                   (
-                  com.amazon.ec2.RunInstances runInstances104
+                  com.amazon.ec2.DeleteSnapshot deleteSnapshot202
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#runInstances");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSnapshot");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param deleteSecurityGroup106
+                                     * @param deleteCustomerGateway204
          */
         
-                 public com.amazon.ec2.DeleteSecurityGroupResponse deleteSecurityGroup
+                 public com.amazon.ec2.DeleteCustomerGatewayResponse deleteCustomerGateway
                   (
-                  com.amazon.ec2.DeleteSecurityGroup deleteSecurityGroup106
+                  com.amazon.ec2.DeleteCustomerGateway deleteCustomerGateway204
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSecurityGroup");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteCustomerGateway");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param deleteVpc108
+                                     * @param createVolume206
          */
         
-                 public com.amazon.ec2.DeleteVpcResponse deleteVpc
+                 public com.amazon.ec2.CreateVolumeResponse createVolume
                   (
-                  com.amazon.ec2.DeleteVpc deleteVpc108
+                  com.amazon.ec2.CreateVolume createVolume206
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVpc");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createVolume");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param deleteVolume110
+                                     * @param cancelExportTask208
          */
         
-                 public com.amazon.ec2.DeleteVolumeResponse deleteVolume
+                 public com.amazon.ec2.CancelExportTaskResponse cancelExportTask
                   (
-                  com.amazon.ec2.DeleteVolume deleteVolume110
+                  com.amazon.ec2.CancelExportTask cancelExportTask208
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVolume");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelExportTask");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param createVpnGateway112
+                                     * @param registerImage210
          */
         
-                 public com.amazon.ec2.CreateVpnGatewayResponse createVpnGateway
+                 public com.amazon.ec2.RegisterImageResponse registerImage
                   (
-                  com.amazon.ec2.CreateVpnGateway createVpnGateway112
+                  com.amazon.ec2.RegisterImage registerImage210
                   )
             {
                 //TODO : fill this with the necessary business logic
-                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createVpnGateway");
+                throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#registerImage");
         }
      
          
         /**
          * Auto generated method signature
          * 
-                                     * @param resetInstanceAttribute114
+                                     * @param detachVolume212
          */
         
-                 public com.amazon.ec2.ResetInstanceAttributeResponse resetInstanceAttribute
+                 public com.amazon.ec2.DetachVolumeResponse detachVolume
                

<TRUNCATED>

[26/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
new file mode 100644
index 0000000..3f01819
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateNetworkAclEntry.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkAclEntry bean class
+            */
+        
+        public  class CreateNetworkAclEntry
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateNetworkAclEntry",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateNetworkAclEntry
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateNetworkAclEntryType localCreateNetworkAclEntry ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateNetworkAclEntryType
+                           */
+                           public  com.amazon.ec2.CreateNetworkAclEntryType getCreateNetworkAclEntry(){
+                               return localCreateNetworkAclEntry;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateNetworkAclEntry
+                               */
+                               public void setCreateNetworkAclEntry(com.amazon.ec2.CreateNetworkAclEntryType param){
+                            
+                                            this.localCreateNetworkAclEntry=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkAclEntry.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateNetworkAclEntry==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateNetworkAclEntry.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateNetworkAclEntry.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkAclEntry parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkAclEntry object =
+                new CreateNetworkAclEntry();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateNetworkAclEntry").equals(reader.getName())){
+                                
+                                                object.setCreateNetworkAclEntry(com.amazon.ec2.CreateNetworkAclEntryType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
new file mode 100644
index 0000000..d852b03
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateNetworkAclEntryResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkAclEntryResponse bean class
+            */
+        
+        public  class CreateNetworkAclEntryResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateNetworkAclEntryResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateNetworkAclEntryResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateNetworkAclEntryResponseType localCreateNetworkAclEntryResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateNetworkAclEntryResponseType
+                           */
+                           public  com.amazon.ec2.CreateNetworkAclEntryResponseType getCreateNetworkAclEntryResponse(){
+                               return localCreateNetworkAclEntryResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateNetworkAclEntryResponse
+                               */
+                               public void setCreateNetworkAclEntryResponse(com.amazon.ec2.CreateNetworkAclEntryResponseType param){
+                            
+                                            this.localCreateNetworkAclEntryResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkAclEntryResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateNetworkAclEntryResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateNetworkAclEntryResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateNetworkAclEntryResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkAclEntryResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkAclEntryResponse object =
+                new CreateNetworkAclEntryResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateNetworkAclEntryResponse").equals(reader.getName())){
+                                
+                                                object.setCreateNetworkAclEntryResponse(com.amazon.ec2.CreateNetworkAclEntryResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
new file mode 100644
index 0000000..954a8d9
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * CreateNetworkAclEntryResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkAclEntryResponseType bean class
+            */
+        
+        public  class CreateNetworkAclEntryResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateNetworkAclEntryResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkAclEntryResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateNetworkAclEntryResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateNetworkAclEntryResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkAclEntryResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkAclEntryResponseType object =
+                new CreateNetworkAclEntryResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateNetworkAclEntryResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateNetworkAclEntryResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[54/71] [abbrv] git commit: updated refs/heads/master to 26af71b

Posted by li...@apache.org.
CLOUDSTACK-3258. In AWSAPI provide Tags support for resource 'security group'

Signed-off-by: Likitha Shetty <li...@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3cfaa929
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3cfaa929
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3cfaa929

Branch: refs/heads/master
Commit: 3cfaa92917b888f59eacc0b632b0d7ba94c65613
Parents: 135b688
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Jun 27 16:57:27 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Jul 4 10:08:42 2013 +0530

----------------------------------------------------------------------
 .../bridge/service/EC2SoapServiceImpl.java      |  2 +
 .../bridge/service/core/ec2/EC2Engine.java      | 13 +++++-
 .../service/core/ec2/EC2GroupFilterSet.java     | 44 ++++++++++++++++++++
 .../service/core/ec2/EC2SecurityGroup.java      | 11 ++++-
 .../stack/models/CloudStackSecurityGroup.java   |  7 ++++
 5 files changed, 75 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cfaa929/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 3e3f578..0edb1fd 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
@@ -2127,6 +2127,8 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 				param4.addItem(param5);
 			}
 			param3.setIpPermissions(param4);
+            EC2TagKeyValue[] tags = group.getResourceTags();
+            param3.setTagSet(setResourceTags(tags));
 			param2.addItem(param3);
 		}
 		param1.setSecurityGroupInfo(param2);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cfaa929/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
index 9d569d4..cb13977 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -2062,7 +2062,14 @@ public class EC2Engine extends ManagerBase {
                     ec2Group.setDomainId(group.getDomainId());
                     ec2Group.setId(group.getId().toString());
                     toPermission(ec2Group, group);
-
+                    List<CloudStackKeyValue> resourceTags = group.getTags();
+                    for(CloudStackKeyValue resourceTag : resourceTags) {
+                        EC2TagKeyValue param = new EC2TagKeyValue();
+                             param.setKey(resourceTag.getKey());
+                        if (resourceTag.getValue() != null)
+                            param.setValue(resourceTag.getValue());
+                        ec2Group.addResourceTag(param);
+                    }
                     groupSet.addGroup(ec2Group);
                 }
             return groupSet;
@@ -2511,6 +2518,8 @@ public class EC2Engine extends ManagerBase {
             return("template");
         else if(resourceType.equalsIgnoreCase("instance"))
             return("userVm");
+        else if (resourceType.equalsIgnoreCase("security-group"))
+            return("securityGroup");
         else
             return resourceType;
     }
@@ -2526,6 +2535,8 @@ public class EC2Engine extends ManagerBase {
             return("image");
         else if(resourceType.equalsIgnoreCase("userVm"))
             return("instance");
+        else if(resourceType.equalsIgnoreCase("securityGroup"))
+            return("security-group");
         else
             return (resourceType.toLowerCase());
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cfaa929/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java
index bd79041..c5b985a 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java
@@ -45,6 +45,8 @@ public class EC2GroupFilterSet {
         filterTypes.put( "ip-permission.group-name","string" );
         filterTypes.put( "ip-permission.user-id",   "string" );
 		filterTypes.put( "owner-id",                "string" );
+        filterTypes.put( "tag-key",                 "string" );
+        filterTypes.put( "tag-value",               "string" );
 	}
 
 
@@ -119,6 +121,42 @@ public class EC2GroupFilterSet {
 			String owner = new String( sg.getDomainId() + ":" + sg.getAccountName()); 
 			return containsString( owner, valueSet );	
 		}
+        else if (filterName.equalsIgnoreCase("tag-key"))
+        {
+            EC2TagKeyValue[] tagSet = sg.getResourceTags();
+            for (EC2TagKeyValue tag : tagSet)
+                if (containsString(tag.getKey(), valueSet)) return true;
+            return false;
+        }
+        else if (filterName.equalsIgnoreCase("tag-value"))
+        {
+            EC2TagKeyValue[] tagSet = sg.getResourceTags();
+            for (EC2TagKeyValue tag : tagSet){
+                if (tag.getValue() == null) {
+                    if (containsEmptyValue(valueSet)) return true;
+                }
+                else {
+                    if (containsString(tag.getValue(), valueSet)) return true;
+                }
+            }
+            return false;
+        }
+        else if (filterName.startsWith("tag:"))
+        {
+            String key = filterName.split(":")[1];
+            EC2TagKeyValue[] tagSet = sg.getResourceTags();
+            for (EC2TagKeyValue tag : tagSet){
+                if (tag.getKey().equalsIgnoreCase(key)) {
+                    if (tag.getValue() == null) {
+                        if (containsEmptyValue(valueSet)) return true;
+                    }
+                    else {
+                        if (containsString(tag.getValue(), valueSet)) return true;
+                    }
+                }
+            }
+            return false;
+        }
 		else return false;
 	}
 
@@ -182,4 +220,10 @@ public class EC2GroupFilterSet {
 		return false;
 	}
 
+    private boolean containsEmptyValue( String[] set ) {
+        for( int i=0; i < set.length; i++ )
+            if (set[i].isEmpty()) return true;
+        return false;
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cfaa929/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SecurityGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SecurityGroup.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SecurityGroup.java
index 468c3cc..3aeb064 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SecurityGroup.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SecurityGroup.java
@@ -27,6 +27,7 @@ public class EC2SecurityGroup {
 	private String accountName;
 	private String domainId;
 	private List<EC2IpPermission> permissionSet = new ArrayList<EC2IpPermission>();    
+    private List<EC2TagKeyValue> tagsSet = new ArrayList<EC2TagKeyValue>();
 
 	public EC2SecurityGroup() {
 		id          = null;
@@ -91,5 +92,13 @@ public class EC2SecurityGroup {
 	public void setDomainId(String domainId) {
 		this.domainId = domainId;
 	}
-	
+
+    public void addResourceTag( EC2TagKeyValue param ) {
+        tagsSet.add( param );
+    }
+
+    public EC2TagKeyValue[] getResourceTags() {
+        return tagsSet.toArray(new EC2TagKeyValue[0]);
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cfaa929/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroup.java b/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroup.java
index 72ba552..e2211f2 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroup.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroup.java
@@ -39,6 +39,8 @@ public class CloudStackSecurityGroup {
     private String name;
     @SerializedName(ApiConstants.INGRESS_RULE)
     private List<CloudStackIngressRule> ingressRules;
+    @SerializedName(ApiConstants.TAGS)
+    private List<CloudStackKeyValue> tags;
 
     
     public CloudStackSecurityGroup() {
@@ -79,4 +81,9 @@ public class CloudStackSecurityGroup {
 	public List<CloudStackIngressRule> getIngressRules() {
 		return ingressRules;
 	}
+
+    public List<CloudStackKeyValue> getTags() {
+        return tags;
+    }
+
 }


[05/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java b/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
index 5283dba..8e4a265 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteTagsSetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteTagsSetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteTagsSetType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.DeleteTagsSetItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteTagsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsType.java b/awsapi/src/com/amazon/ec2/DeleteTagsType.java
index 1ccd3b0..682ecee 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteTagsType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteTagsType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteTagsType",
@@ -207,13 +191,13 @@
                                             if (localResourcesSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("resourcesSet cannot be null!!");
                                             }
-                                           localResourcesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","resourcesSet"),
+                                           localResourcesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","resourcesSet"),
                                                factory,xmlWriter);
                                         
                                             if (localTagSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("tagSet cannot be null!!");
                                             }
-                                           localTagSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","tagSet"),
+                                           localTagSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","tagSet"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -378,7 +362,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "resourcesSet"));
                             
                             
@@ -387,7 +371,7 @@
                                     }
                                     elementList.add(localResourcesSet);
                                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "tagSet"));
                             
                             
@@ -474,7 +458,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","resourcesSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","resourcesSet").equals(reader.getName())){
                                 
                                                 object.setResourcesSet(com.amazon.ec2.ResourceIdSetType.Factory.parse(reader));
                                               
@@ -490,7 +474,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","tagSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","tagSet").equals(reader.getName())){
                                 
                                                 object.setTagSet(com.amazon.ec2.DeleteTagsSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolume.java b/awsapi/src/com/amazon/ec2/DeleteVolume.java
index 1b6a7e4..591ef92 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolume.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolume.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVolume.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteVolume",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteVolume").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteVolume").equals(reader.getName())){
                                 
                                                 object.setDeleteVolume(com.amazon.ec2.DeleteVolumeType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java b/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
index e9e847f..2b8308c 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVolumeResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteVolumeResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteVolumeResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteVolumeResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteVolumeResponse(com.amazon.ec2.DeleteVolumeResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
index dfeb92f..1370a09 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVolumeResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteVolumeResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteVolumeResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeType.java b/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
index 8b93d85..3023c18 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVolumeType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteVolumeType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteVolumeType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "volumeId"));
                                  
                                         if (localVolumeId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","volumeId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","volumeId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpc.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpc.java b/awsapi/src/com/amazon/ec2/DeleteVpc.java
index 508e704..8956003 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpc.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpc.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpc.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteVpc",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteVpc").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteVpc").equals(reader.getName())){
                                 
                                                 object.setDeleteVpc(com.amazon.ec2.DeleteVpcType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
index a8617e3..f06c09c 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpcResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteVpcResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteVpcResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteVpcResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteVpcResponse(com.amazon.ec2.DeleteVpcResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
index f1cd2ef..6e5413b 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpcResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteVpcResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteVpcResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpcType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcType.java b/awsapi/src/com/amazon/ec2/DeleteVpcType.java
index aa66ac0..717c142 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpcType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpcType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpcType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteVpcType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteVpcType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpcId"));
                                  
                                         if (localVpcId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpcId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpcId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
index a187aee..c882979 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpnConnection.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteVpnConnection",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteVpnConnection").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteVpnConnection").equals(reader.getName())){
                                 
                                                 object.setDeleteVpnConnection(com.amazon.ec2.DeleteVpnConnectionType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
index 63c4773..3d06bc0 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpnConnectionResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteVpnConnectionResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteVpnConnectionResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteVpnConnectionResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteVpnConnectionResponse(com.amazon.ec2.DeleteVpnConnectionResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
index 7b10072..3b9b3ef 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteVpnConnectionResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteVpnConnectionResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteVpnConnectionResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
new file mode 100644
index 0000000..697f5f1
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteVpnConnectionRoute.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteVpnConnectionRoute bean class
+            */
+        
+        public  class DeleteVpnConnectionRoute
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteVpnConnectionRoute",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteVpnConnectionRoute
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteVpnConnectionRouteType localDeleteVpnConnectionRoute ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteVpnConnectionRouteType
+                           */
+                           public  com.amazon.ec2.DeleteVpnConnectionRouteType getDeleteVpnConnectionRoute(){
+                               return localDeleteVpnConnectionRoute;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteVpnConnectionRoute
+                               */
+                               public void setDeleteVpnConnectionRoute(com.amazon.ec2.DeleteVpnConnectionRouteType param){
+                            
+                                            this.localDeleteVpnConnectionRoute=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteVpnConnectionRoute.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteVpnConnectionRoute==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteVpnConnectionRoute.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteVpnConnectionRoute.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteVpnConnectionRoute parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteVpnConnectionRoute object =
+                new DeleteVpnConnectionRoute();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteVpnConnectionRoute").equals(reader.getName())){
+                                
+                                                object.setDeleteVpnConnectionRoute(com.amazon.ec2.DeleteVpnConnectionRouteType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[28/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
new file mode 100644
index 0000000..8fc718b
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
@@ -0,0 +1,733 @@
+
+/**
+ * CreateInstanceExportTaskType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateInstanceExportTaskType bean class
+            */
+        
+        public  class CreateInstanceExportTaskType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateInstanceExportTaskType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for Description
+                        */
+
+                        
+                                    protected java.lang.String localDescription ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localDescriptionTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getDescription(){
+                               return localDescription;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Description
+                               */
+                               public void setDescription(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localDescriptionTracker = true;
+                                       } else {
+                                          localDescriptionTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localDescription=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for InstanceId
+                        */
+
+                        
+                                    protected java.lang.String localInstanceId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getInstanceId(){
+                               return localInstanceId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param InstanceId
+                               */
+                               public void setInstanceId(java.lang.String param){
+                            
+                                            this.localInstanceId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for TargetEnvironment
+                        */
+
+                        
+                                    protected java.lang.String localTargetEnvironment ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getTargetEnvironment(){
+                               return localTargetEnvironment;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param TargetEnvironment
+                               */
+                               public void setTargetEnvironment(java.lang.String param){
+                            
+                                            this.localTargetEnvironment=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for CreateInstanceExportTaskTypeChoice_type0
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateInstanceExportTaskTypeChoice_type0 localCreateInstanceExportTaskTypeChoice_type0 ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateInstanceExportTaskTypeChoice_type0
+                           */
+                           public  com.amazon.ec2.CreateInstanceExportTaskTypeChoice_type0 getCreateInstanceExportTaskTypeChoice_type0(){
+                               return localCreateInstanceExportTaskTypeChoice_type0;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateInstanceExportTaskTypeChoice_type0
+                               */
+                               public void setCreateInstanceExportTaskTypeChoice_type0(com.amazon.ec2.CreateInstanceExportTaskTypeChoice_type0 param){
+                            
+                                            this.localCreateInstanceExportTaskTypeChoice_type0=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateInstanceExportTaskType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateInstanceExportTaskType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateInstanceExportTaskType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+                if (localDescriptionTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"description", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"description");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("description");
+                                    }
+                                
+
+                                          if (localDescription==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("description cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localDescription);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"instanceId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"instanceId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("instanceId");
+                                    }
+                                
+
+                                          if (localInstanceId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localInstanceId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"targetEnvironment", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"targetEnvironment");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("targetEnvironment");
+                                    }
+                                
+
+                                          if (localTargetEnvironment==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("targetEnvironment cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localTargetEnvironment);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                            if (localCreateInstanceExportTaskTypeChoice_type0==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("CreateInstanceExportTaskTypeChoice_type0 cannot be null!!");
+                                            }
+                                           localCreateInstanceExportTaskTypeChoice_type0.serialize(null,factory,xmlWriter);
+                                        
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                 if (localDescriptionTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "description"));
+                                 
+                                        if (localDescription != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDescription));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("description cannot be null!!");
+                                        }
+                                    }
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "instanceId"));
+                                 
+                                        if (localInstanceId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localInstanceId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "targetEnvironment"));
+                                 
+                                        if (localTargetEnvironment != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localTargetEnvironment));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("targetEnvironment cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "CreateInstanceExportTaskTypeChoice_type0"));
+                            
+                            
+                                    if (localCreateInstanceExportTaskTypeChoice_type0==null){
+                                         throw new org.apache.axis2.databinding.ADBException("CreateInstanceExportTaskTypeChoice_type0 cannot be null!!");
+                                    }
+                                    elementList.add(localCreateInstanceExportTaskTypeChoice_type0);
+                                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateInstanceExportTaskType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateInstanceExportTaskType object =
+                new CreateInstanceExportTaskType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateInstanceExportTaskType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateInstanceExportTaskType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","description").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setDescription(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setInstanceId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","targetEnvironment").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setTargetEnvironment(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() ){
+                                
+                                                object.setCreateInstanceExportTaskTypeChoice_type0(com.amazon.ec2.CreateInstanceExportTaskTypeChoice_type0.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                  
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
new file mode 100644
index 0000000..921ddff
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
@@ -0,0 +1,410 @@
+
+/**
+ * CreateInstanceExportTaskTypeChoice_type0.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateInstanceExportTaskTypeChoice_type0 bean class
+            */
+        
+        public  class CreateInstanceExportTaskTypeChoice_type0
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateInstanceExportTaskTypeChoice_type0
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+            /** Whenever a new property is set ensure all others are unset
+             *  There can be only one choice and the last one wins
+             */
+            private void clearAllSettingTrackers() {
+            
+                   localExportToS3Tracker = false;
+                
+            }
+        
+
+                        /**
+                        * field for ExportToS3
+                        */
+
+                        
+                                    protected com.amazon.ec2.ExportToS3TaskType localExportToS3 ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localExportToS3Tracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.ExportToS3TaskType
+                           */
+                           public  com.amazon.ec2.ExportToS3TaskType getExportToS3(){
+                               return localExportToS3;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param ExportToS3
+                               */
+                               public void setExportToS3(com.amazon.ec2.ExportToS3TaskType param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localExportToS3Tracker = true;
+                                       } else {
+                                          localExportToS3Tracker = false;
+                                              
+                                       }
+                                   
+                                            this.localExportToS3=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateInstanceExportTaskTypeChoice_type0.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateInstanceExportTaskTypeChoice_type0",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateInstanceExportTaskTypeChoice_type0",
+                           xmlWriter);
+                   }
+
+               
+                   }
+                if (localExportToS3Tracker){
+                                            if (localExportToS3==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("exportToS3 cannot be null!!");
+                                            }
+                                           localExportToS3.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","exportToS3"),
+                                               factory,xmlWriter);
+                                        }
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                 if (localExportToS3Tracker){
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "exportToS3"));
+                            
+                            
+                                    if (localExportToS3==null){
+                                         throw new org.apache.axis2.databinding.ADBException("exportToS3 cannot be null!!");
+                                    }
+                                    elementList.add(localExportToS3);
+                                }
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateInstanceExportTaskTypeChoice_type0 parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateInstanceExportTaskTypeChoice_type0 object =
+                new CreateInstanceExportTaskTypeChoice_type0();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","exportToS3").equals(reader.getName())){
+                                
+                                                object.setExportToS3(com.amazon.ec2.ExportToS3TaskType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGateway.java b/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
new file mode 100644
index 0000000..73d1f17
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateInternetGateway.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateInternetGateway bean class
+            */
+        
+        public  class CreateInternetGateway
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateInternetGateway",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateInternetGateway
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateInternetGatewayType localCreateInternetGateway ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateInternetGatewayType
+                           */
+                           public  com.amazon.ec2.CreateInternetGatewayType getCreateInternetGateway(){
+                               return localCreateInternetGateway;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateInternetGateway
+                               */
+                               public void setCreateInternetGateway(com.amazon.ec2.CreateInternetGatewayType param){
+                            
+                                            this.localCreateInternetGateway=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateInternetGateway.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateInternetGateway==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateInternetGateway.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateInternetGateway.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateInternetGateway parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateInternetGateway object =
+                new CreateInternetGateway();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateInternetGateway").equals(reader.getName())){
+                                
+                                                object.setCreateInternetGateway(com.amazon.ec2.CreateInternetGatewayType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
new file mode 100644
index 0000000..3998fd8
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateInternetGatewayResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateInternetGatewayResponse bean class
+            */
+        
+        public  class CreateInternetGatewayResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateInternetGatewayResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateInternetGatewayResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateInternetGatewayResponseType localCreateInternetGatewayResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateInternetGatewayResponseType
+                           */
+                           public  com.amazon.ec2.CreateInternetGatewayResponseType getCreateInternetGatewayResponse(){
+                               return localCreateInternetGatewayResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateInternetGatewayResponse
+                               */
+                               public void setCreateInternetGatewayResponse(com.amazon.ec2.CreateInternetGatewayResponseType param){
+                            
+                                            this.localCreateInternetGatewayResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateInternetGatewayResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateInternetGatewayResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateInternetGatewayResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateInternetGatewayResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateInternetGatewayResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateInternetGatewayResponse object =
+                new CreateInternetGatewayResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateInternetGatewayResponse").equals(reader.getName())){
+                                
+                                                object.setCreateInternetGatewayResponse(com.amazon.ec2.CreateInternetGatewayResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[60/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java
index c07a907..f7f113e 100644
--- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyImageAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java
index 7b6ba81..54264fc 100644
--- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyImageAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java
index eb72923..64c906f 100644
--- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyImageAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java
index 961b7ed..641fef1 100644
--- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyImageAttributeTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java
index 902c4d9..41125bc 100644
--- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyInstanceAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java
index 890220c..152f93b 100644
--- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyInstanceAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java
index 32edbdf..1601c25 100644
--- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyInstanceAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java
index fa545de..cbbb035 100644
--- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyInstanceAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java
index e97828b..a028188 100644
--- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyInstanceAttributeTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java
index a5aa3c6..6125eba 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyNetworkInterfaceAttachmentType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java
index 736bbe5..20e0944 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyNetworkInterfaceAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java
index 10f7c2c..6d93faa 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyNetworkInterfaceAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java
index 4941828..5800dd7 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyNetworkInterfaceAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java
index 07d970d..bea3d23 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyNetworkInterfaceAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java
index c8dcbf9..f74d154 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyNetworkInterfaceAttributeTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java
index 7112850..b7a8cb4 100644
--- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifySnapshotAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java
index 50c8bcd..019d54e 100644
--- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifySnapshotAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java
index bf91323..5bd5b69 100644
--- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifySnapshotAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java
index aaf4eab..f861d37 100644
--- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifySnapshotAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java
index 39c1c44..914419c 100644
--- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyVolumeAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java
index d9111c2..eba686b 100644
--- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyVolumeAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java
index 1545bd6..809dd4e 100644
--- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyVolumeAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java
index ee0b936..0098c33 100644
--- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyVolumeAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java
index 314a1ed..7db2547 100644
--- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyVolumeAttributeTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/MonitorInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstances.java b/awsapi/src/com/amazon/ec2/MonitorInstances.java
index bd93fd7..6029397 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstances.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstances.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * MonitorInstances.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java
index 4845662..eed53ff 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * MonitorInstancesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java
index 4ed09b8..4a2d8e0 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * MonitorInstancesResponseSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java
index ffecda7..04f67f8 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * MonitorInstancesResponseSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java
index bb58f2d..0e8a797 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * MonitorInstancesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java
index f181c8b..a4a9033 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * MonitorInstancesSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java
index 8df49a8..f71a6c3 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * MonitorInstancesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/MonitorInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesType.java
index 69e8adb..b6fb4a1 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * MonitorInstancesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java b/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java
index 835ea8c..d2b3b0a 100644
--- a/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java
+++ b/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * MonitoringInstanceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java b/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java
index 9412c85..d0e4231 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkAclAssociationSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java b/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java
index fcc22ce..fae5922 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkAclAssociationType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java b/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java
index 14c5769..5037917 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkAclEntrySetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java
index 4fdcbf9..26ed1ce 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkAclEntryType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java b/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java
index 0fa20e6..10f6f2d 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkAclIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java b/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java
index 291d0a2..a33c131 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkAclIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkAclSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclSetType.java b/awsapi/src/com/amazon/ec2/NetworkAclSetType.java
index 3353635..6661f21 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkAclSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkAclType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclType.java b/awsapi/src/com/amazon/ec2/NetworkAclType.java
index 817da03..18153c3 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkAclType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java
index 8fec44d..55b4ea2 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkInterfaceAssociationType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java
index 4747848..2fc3f07 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkInterfaceAttachmentType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java
index 9facf07..a2eaef7 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkInterfaceIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java
index ab6853c..93b71bd 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkInterfaceIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java
index a37822c..71920d3 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkInterfacePrivateIpAddressesSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java
index b68df1b..92da34c 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkInterfacePrivateIpAddressesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java
index b598d06..5370a79 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkInterfaceSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java
index 6df3ef7..01eaf34 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NetworkInterfaceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java b/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java
index 4f7b999..6a71c0b 100644
--- a/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java
+++ b/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NullableAttributeBooleanValueType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java b/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java
index bd75229..6935bf0 100644
--- a/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java
+++ b/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * NullableAttributeValueType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java b/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java
index 102e3fd..0e05ad4 100644
--- a/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java
+++ b/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PlacementGroupInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java b/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java
index c00bb7b..ac56384 100644
--- a/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java
+++ b/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PlacementGroupSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PlacementRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PlacementRequestType.java b/awsapi/src/com/amazon/ec2/PlacementRequestType.java
index 0dde5f7..502cb5b 100644
--- a/awsapi/src/com/amazon/ec2/PlacementRequestType.java
+++ b/awsapi/src/com/amazon/ec2/PlacementRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PlacementRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PlacementResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PlacementResponseType.java b/awsapi/src/com/amazon/ec2/PlacementResponseType.java
index ed22bd1..96155f9 100644
--- a/awsapi/src/com/amazon/ec2/PlacementResponseType.java
+++ b/awsapi/src/com/amazon/ec2/PlacementResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PlacementResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PortRangeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PortRangeType.java b/awsapi/src/com/amazon/ec2/PortRangeType.java
index 3bb221c..bc783a1 100644
--- a/awsapi/src/com/amazon/ec2/PortRangeType.java
+++ b/awsapi/src/com/amazon/ec2/PortRangeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PortRangeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java
index f02548f..28eec8f 100644
--- a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PriceScheduleRequestSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java
index 9fd1057..7e9b0ca 100644
--- a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java
+++ b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PriceScheduleRequestSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java b/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java
index a7c6974..8cb4a0d 100644
--- a/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PriceScheduleSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java b/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java
index c11fa44..5d827ea 100644
--- a/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java
+++ b/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PriceScheduleSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java b/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java
index 328b18c..e5b56dd 100644
--- a/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PricingDetailsSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java b/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java
index 27db0b0..8a5e77b 100644
--- a/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java
+++ b/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PricingDetailsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java
index 4635a7f..684401c 100644
--- a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java
+++ b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PrivateIpAddressesSetItemRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java
index d7619c1..e3b9e70 100644
--- a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java
+++ b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PrivateIpAddressesSetRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ProductCodeItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductCodeItemType.java b/awsapi/src/com/amazon/ec2/ProductCodeItemType.java
index 696a85a..57273f8 100644
--- a/awsapi/src/com/amazon/ec2/ProductCodeItemType.java
+++ b/awsapi/src/com/amazon/ec2/ProductCodeItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ProductCodeItemType.java


[44/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
new file mode 100644
index 0000000..ae81126
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
@@ -0,0 +1,362 @@
+
+/**
+ * AssignPrivateIpAddresses.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssignPrivateIpAddresses bean class
+            */
+        
+        public  class AssignPrivateIpAddresses
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "AssignPrivateIpAddresses",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AssignPrivateIpAddresses
+                        */
+
+                        
+                                    protected com.amazon.ec2.AssignPrivateIpAddressesType localAssignPrivateIpAddresses ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AssignPrivateIpAddressesType
+                           */
+                           public  com.amazon.ec2.AssignPrivateIpAddressesType getAssignPrivateIpAddresses(){
+                               return localAssignPrivateIpAddresses;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AssignPrivateIpAddresses
+                               */
+                               public void setAssignPrivateIpAddresses(com.amazon.ec2.AssignPrivateIpAddressesType param){
+                            
+                                            this.localAssignPrivateIpAddresses=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssignPrivateIpAddresses.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localAssignPrivateIpAddresses==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localAssignPrivateIpAddresses.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localAssignPrivateIpAddresses.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssignPrivateIpAddresses parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssignPrivateIpAddresses object =
+                new AssignPrivateIpAddresses();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AssignPrivateIpAddresses").equals(reader.getName())){
+                                
+                                                object.setAssignPrivateIpAddresses(com.amazon.ec2.AssignPrivateIpAddressesType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
new file mode 100644
index 0000000..86e4f68
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * AssignPrivateIpAddressesResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssignPrivateIpAddressesResponse bean class
+            */
+        
+        public  class AssignPrivateIpAddressesResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "AssignPrivateIpAddressesResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AssignPrivateIpAddressesResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.AssignPrivateIpAddressesResponseType localAssignPrivateIpAddressesResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AssignPrivateIpAddressesResponseType
+                           */
+                           public  com.amazon.ec2.AssignPrivateIpAddressesResponseType getAssignPrivateIpAddressesResponse(){
+                               return localAssignPrivateIpAddressesResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AssignPrivateIpAddressesResponse
+                               */
+                               public void setAssignPrivateIpAddressesResponse(com.amazon.ec2.AssignPrivateIpAddressesResponseType param){
+                            
+                                            this.localAssignPrivateIpAddressesResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssignPrivateIpAddressesResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localAssignPrivateIpAddressesResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localAssignPrivateIpAddressesResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localAssignPrivateIpAddressesResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssignPrivateIpAddressesResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssignPrivateIpAddressesResponse object =
+                new AssignPrivateIpAddressesResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AssignPrivateIpAddressesResponse").equals(reader.getName())){
+                                
+                                                object.setAssignPrivateIpAddressesResponse(com.amazon.ec2.AssignPrivateIpAddressesResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
new file mode 100644
index 0000000..c889c6e
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * AssignPrivateIpAddressesResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssignPrivateIpAddressesResponseType bean class
+            */
+        
+        public  class AssignPrivateIpAddressesResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AssignPrivateIpAddressesResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssignPrivateIpAddressesResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AssignPrivateIpAddressesResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AssignPrivateIpAddressesResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssignPrivateIpAddressesResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssignPrivateIpAddressesResponseType object =
+                new AssignPrivateIpAddressesResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AssignPrivateIpAddressesResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AssignPrivateIpAddressesResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
new file mode 100644
index 0000000..dd2ead1
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
@@ -0,0 +1,483 @@
+
+/**
+ * AssignPrivateIpAddressesSetItemRequestType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssignPrivateIpAddressesSetItemRequestType bean class
+            */
+        
+        public  class AssignPrivateIpAddressesSetItemRequestType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AssignPrivateIpAddressesSetItemRequestType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for PrivateIpAddress
+                        */
+
+                        
+                                    protected java.lang.String localPrivateIpAddress ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getPrivateIpAddress(){
+                               return localPrivateIpAddress;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param PrivateIpAddress
+                               */
+                               public void setPrivateIpAddress(java.lang.String param){
+                            
+                                            this.localPrivateIpAddress=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssignPrivateIpAddressesSetItemRequestType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AssignPrivateIpAddressesSetItemRequestType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AssignPrivateIpAddressesSetItemRequestType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"privateIpAddress", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"privateIpAddress");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("privateIpAddress");
+                                    }
+                                
+
+                                          if (localPrivateIpAddress==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("privateIpAddress cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localPrivateIpAddress);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "privateIpAddress"));
+                                 
+                                        if (localPrivateIpAddress != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPrivateIpAddress));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("privateIpAddress cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssignPrivateIpAddressesSetItemRequestType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssignPrivateIpAddressesSetItemRequestType object =
+                new AssignPrivateIpAddressesSetItemRequestType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AssignPrivateIpAddressesSetItemRequestType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AssignPrivateIpAddressesSetItemRequestType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","privateIpAddress").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setPrivateIpAddress(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[31/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
index 93efbf8..a99518e 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelSpotInstanceRequestsResponseSetItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CancelSpotInstanceRequestsResponseSetItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CancelSpotInstanceRequestsResponseSetItemType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -434,7 +418,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "spotInstanceRequestId"));
                                  
                                         if (localSpotInstanceRequestId != null){
@@ -443,7 +427,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("spotInstanceRequestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "state"));
                                  
                                         if (localState != null){
@@ -530,7 +514,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","spotInstanceRequestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","spotInstanceRequestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +533,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","state").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","state").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
index 7331856..8cf225c 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelSpotInstanceRequestsResponseSetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CancelSpotInstanceRequestsResponseSetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -199,7 +183,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CancelSpotInstanceRequestsResponseSetType",
@@ -216,7 +200,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -397,7 +381,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -494,7 +478,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -516,7 +500,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
index 37e99a3..3da3703 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelSpotInstanceRequestsResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CancelSpotInstanceRequestsResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CancelSpotInstanceRequestsResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localSpotInstanceRequestSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("spotInstanceRequestSet cannot be null!!");
                                             }
-                                           localSpotInstanceRequestSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","spotInstanceRequestSet"),
+                                           localSpotInstanceRequestSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","spotInstanceRequestSet"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "spotInstanceRequestSet"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","spotInstanceRequestSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","spotInstanceRequestSet").equals(reader.getName())){
                                 
                                                 object.setSpotInstanceRequestSet(com.amazon.ec2.CancelSpotInstanceRequestsResponseSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
index 6cc7c93..2b810b5 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelSpotInstanceRequestsType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CancelSpotInstanceRequestsType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CancelSpotInstanceRequestsType",
@@ -177,7 +161,7 @@
                                             if (localSpotInstanceRequestIdSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("spotInstanceRequestIdSet cannot be null!!");
                                             }
-                                           localSpotInstanceRequestIdSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","spotInstanceRequestIdSet"),
+                                           localSpotInstanceRequestIdSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","spotInstanceRequestIdSet"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -342,7 +326,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "spotInstanceRequestIdSet"));
                             
                             
@@ -429,7 +413,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","spotInstanceRequestIdSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","spotInstanceRequestIdSet").equals(reader.getName())){
                                 
                                                 object.setSpotInstanceRequestIdSet(com.amazon.ec2.SpotInstanceRequestIdSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
index 5288dea..64db4bc 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ConfirmProductInstance.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "ConfirmProductInstance",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ConfirmProductInstance").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ConfirmProductInstance").equals(reader.getName())){
                                 
                                                 object.setConfirmProductInstance(com.amazon.ec2.ConfirmProductInstanceType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
index 56bde3d..b5541b6 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ConfirmProductInstanceResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "ConfirmProductInstanceResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ConfirmProductInstanceResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ConfirmProductInstanceResponse").equals(reader.getName())){
                                 
                                                 object.setConfirmProductInstanceResponse(com.amazon.ec2.ConfirmProductInstanceResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
index ddbfd00..14cf24f 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ConfirmProductInstanceResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = ConfirmProductInstanceResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -234,7 +218,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":ConfirmProductInstanceResponseType",
@@ -248,7 +232,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -282,7 +266,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -311,7 +295,7 @@
                                     
                                    xmlWriter.writeEndElement();
                               if (localOwnerIdTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -507,7 +491,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -516,13 +500,13 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
                              if (localOwnerIdTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "ownerId"));
                                  
                                         if (localOwnerId != null){
@@ -609,7 +593,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -628,7 +612,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -647,7 +631,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ownerId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ownerId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
index 51cd3d2..3d39a57 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ConfirmProductInstanceType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = ConfirmProductInstanceType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":ConfirmProductInstanceType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -434,7 +418,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "productCode"));
                                  
                                         if (localProductCode != null){
@@ -443,7 +427,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("productCode cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "instanceId"));
                                  
                                         if (localInstanceId != null){
@@ -530,7 +514,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","productCode").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","productCode").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +533,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","instanceId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java b/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
index 0540340..198b837 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ConversionTaskIdItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = ConversionTaskIdItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -54,12 +38,6 @@
                         
                                     protected java.lang.String localConversionTaskId ;
                                 
-                           /*  This tracker boolean wil be used to detect whether the user called the set method
-                          *   for this attribute. It will be used to determine whether to include this field
-                           *   in the serialized XML
-                           */
-                           protected boolean localConversionTaskIdTracker = false ;
-                           
 
                            /**
                            * Auto generated getter method
@@ -77,14 +55,6 @@
                                */
                                public void setConversionTaskId(java.lang.String param){
                             
-                                       if (param != null){
-                                          //update the setting tracker
-                                          localConversionTaskIdTracker = true;
-                                       } else {
-                                          localConversionTaskIdTracker = false;
-                                              
-                                       }
-                                   
                                             this.localConversionTaskId=param;
                                     
 
@@ -174,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":ConversionTaskIdItemType",
@@ -187,8 +157,8 @@
 
                
                    }
-                if (localConversionTaskIdTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -221,7 +191,7 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             }
+                             
                     xmlWriter.writeEndElement();
                
 
@@ -383,8 +353,8 @@
                  java.util.ArrayList elementList = new java.util.ArrayList();
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
-                 if (localConversionTaskIdTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "conversionTaskId"));
                                  
                                         if (localConversionTaskId != null){
@@ -392,7 +362,7 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("conversionTaskId cannot be null!!");
                                         }
-                                    }
+                                    
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -471,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","conversionTaskId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","conversionTaskId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -482,10 +452,11 @@
                                     
                               }  // End of if for expected property start element
                                 
-                                    else {
-                                        
-                                    }
-                                  
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();
                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java b/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
index 4c673ca..582bcf9 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ConversionTaskIdSetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = ConversionTaskIdSetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":ConversionTaskIdSetType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.ConversionTaskIdItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java b/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
index de63f54..b2cb323 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ConversionTaskSetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = ConversionTaskSetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":ConversionTaskSetType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.ConversionTaskType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ConversionTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskType.java b/awsapi/src/com/amazon/ec2/ConversionTaskType.java
index 750261b..a7916d1 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ConversionTaskType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = ConversionTaskType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -225,6 +209,50 @@
                                }
                             
 
+                        /**
+                        * field for TagSet
+                        */
+
+                        
+                                    protected com.amazon.ec2.ResourceTagSetType localTagSet ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localTagSetTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.ResourceTagSetType
+                           */
+                           public  com.amazon.ec2.ResourceTagSetType getTagSet(){
+                               return localTagSet;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param TagSet
+                               */
+                               public void setTagSet(com.amazon.ec2.ResourceTagSetType param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localTagSetTracker = true;
+                                       } else {
+                                          localTagSetTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localTagSet=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -308,7 +336,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":ConversionTaskType",
@@ -322,7 +350,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -356,7 +384,7 @@
                                     
                                    xmlWriter.writeEndElement();
                               if (localExpirationTimeTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -395,7 +423,7 @@
                                             }
                                            localConversionTaskTypeChoice_type0.serialize(null,factory,xmlWriter);
                                         
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +457,7 @@
                                     
                                    xmlWriter.writeEndElement();
                               if (localStatusMessageTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -462,7 +490,13 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             }
+                             } if (localTagSetTracker){
+                                            if (localTagSet==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("tagSet cannot be null!!");
+                                            }
+                                           localTagSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","tagSet"),
+                                               factory,xmlWriter);
+                                        }
                     xmlWriter.writeEndElement();
                
 
@@ -625,7 +659,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "conversionTaskId"));
                                  
                                         if (localConversionTaskId != null){
@@ -634,7 +668,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("conversionTaskId cannot be null!!");
                                         }
                                      if (localExpirationTimeTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "expirationTime"));
                                  
                                         if (localExpirationTime != null){
@@ -643,7 +677,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("expirationTime cannot be null!!");
                                         }
                                     }
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "ConversionTaskTypeChoice_type0"));
                             
                             
@@ -652,7 +686,7 @@
                                     }
                                     elementList.add(localConversionTaskTypeChoice_type0);
                                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "state"));
                                  
                                         if (localState != null){
@@ -661,7 +695,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("state cannot be null!!");
                                         }
                                      if (localStatusMessageTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "statusMessage"));
                                  
                                         if (localStatusMessage != null){
@@ -669,7 +703,16 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("statusMessage cannot be null!!");
                                         }
+                                    } if (localTagSetTracker){
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "tagSet"));
+                            
+                            
+                                    if (localTagSet==null){
+                                         throw new org.apache.axis2.databinding.ADBException("tagSet cannot be null!!");
                                     }
+                                    elementList.add(localTagSet);
+                                }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -748,7 +791,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","conversionTaskId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","conversionTaskId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -767,7 +810,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","expirationTime").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","expirationTime").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -794,7 +837,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","state").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","state").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -813,7 +856,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","statusMessage").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","statusMessage").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -827,6 +870,21 @@
                                     else {
                                         
                                     }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","tagSet").equals(reader.getName())){
+                                
+                                                object.setTagSet(com.amazon.ec2.ResourceTagSetType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
                                   
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();


[45/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
index f870088..a506259 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AmazonEC2SkeletonInterface.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:00 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:00:16 CEST)
  */
     package com.amazon.ec2;
     /**
@@ -31,13 +15,643 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param registerImage
+                                    * @param describePlacementGroups
+         */
+
+        
+                public com.amazon.ec2.DescribePlacementGroupsResponse describePlacementGroups
+                (
+                  com.amazon.ec2.DescribePlacementGroups describePlacementGroups
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param createSecurityGroup
+         */
+
+        
+                public com.amazon.ec2.CreateSecurityGroupResponse createSecurityGroup
+                (
+                  com.amazon.ec2.CreateSecurityGroup createSecurityGroup
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param resetNetworkInterfaceAttribute
+         */
+
+        
+                public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute
+                (
+                  com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param createDhcpOptions
+         */
+
+        
+                public com.amazon.ec2.CreateDhcpOptionsResponse createDhcpOptions
+                (
+                  com.amazon.ec2.CreateDhcpOptions createDhcpOptions
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param createRouteTable
+         */
+
+        
+                public com.amazon.ec2.CreateRouteTableResponse createRouteTable
+                (
+                  com.amazon.ec2.CreateRouteTable createRouteTable
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeSubnets
+         */
+
+        
+                public com.amazon.ec2.DescribeSubnetsResponse describeSubnets
+                (
+                  com.amazon.ec2.DescribeSubnets describeSubnets
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param deactivateLicense
+         */
+
+        
+                public com.amazon.ec2.DeactivateLicenseResponse deactivateLicense
+                (
+                  com.amazon.ec2.DeactivateLicense deactivateLicense
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param deleteVpc
+         */
+
+        
+                public com.amazon.ec2.DeleteVpcResponse deleteVpc
+                (
+                  com.amazon.ec2.DeleteVpc deleteVpc
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param cancelSpotInstanceRequests
+         */
+
+        
+                public com.amazon.ec2.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequests
+                (
+                  com.amazon.ec2.CancelSpotInstanceRequests cancelSpotInstanceRequests
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param createSubnet
+         */
+
+        
+                public com.amazon.ec2.CreateSubnetResponse createSubnet
+                (
+                  com.amazon.ec2.CreateSubnet createSubnet
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param deleteVpnGateway
+         */
+
+        
+                public com.amazon.ec2.DeleteVpnGatewayResponse deleteVpnGateway
+                (
+                  com.amazon.ec2.DeleteVpnGateway deleteVpnGateway
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param createNetworkAclEntry
+         */
+
+        
+                public com.amazon.ec2.CreateNetworkAclEntryResponse createNetworkAclEntry
+                (
+                  com.amazon.ec2.CreateNetworkAclEntry createNetworkAclEntry
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param requestSpotInstances
+         */
+
+        
+                public com.amazon.ec2.RequestSpotInstancesResponse requestSpotInstances
+                (
+                  com.amazon.ec2.RequestSpotInstances requestSpotInstances
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeVolumeAttribute
+         */
+
+        
+                public com.amazon.ec2.DescribeVolumeAttributeResponse describeVolumeAttribute
+                (
+                  com.amazon.ec2.DescribeVolumeAttribute describeVolumeAttribute
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param associateDhcpOptions
+         */
+
+        
+                public com.amazon.ec2.AssociateDhcpOptionsResponse associateDhcpOptions
+                (
+                  com.amazon.ec2.AssociateDhcpOptions associateDhcpOptions
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeTags
+         */
+
+        
+                public com.amazon.ec2.DescribeTagsResponse describeTags
+                (
+                  com.amazon.ec2.DescribeTags describeTags
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param importKeyPair
+         */
+
+        
+                public com.amazon.ec2.ImportKeyPairResponse importKeyPair
+                (
+                  com.amazon.ec2.ImportKeyPair importKeyPair
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param deleteNetworkInterface
+         */
+
+        
+                public com.amazon.ec2.DeleteNetworkInterfaceResponse deleteNetworkInterface
+                (
+                  com.amazon.ec2.DeleteNetworkInterface deleteNetworkInterface
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeVpcs
+         */
+
+        
+                public com.amazon.ec2.DescribeVpcsResponse describeVpcs
+                (
+                  com.amazon.ec2.DescribeVpcs describeVpcs
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeLicenses
+         */
+
+        
+                public com.amazon.ec2.DescribeLicensesResponse describeLicenses
+                (
+                  com.amazon.ec2.DescribeLicenses describeLicenses
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param bundleInstance
+         */
+
+        
+                public com.amazon.ec2.BundleInstanceResponse bundleInstance
+                (
+                  com.amazon.ec2.BundleInstance bundleInstance
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeVpnConnections
+         */
+
+        
+                public com.amazon.ec2.DescribeVpnConnectionsResponse describeVpnConnections
+                (
+                  com.amazon.ec2.DescribeVpnConnections describeVpnConnections
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeImages
+         */
+
+        
+                public com.amazon.ec2.DescribeImagesResponse describeImages
+                (
+                  com.amazon.ec2.DescribeImages describeImages
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param createInternetGateway
+         */
+
+        
+                public com.amazon.ec2.CreateInternetGatewayResponse createInternetGateway
+                (
+                  com.amazon.ec2.CreateInternetGateway createInternetGateway
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param disassociateRouteTable
+         */
+
+        
+                public com.amazon.ec2.DisassociateRouteTableResponse disassociateRouteTable
+                (
+                  com.amazon.ec2.DisassociateRouteTable disassociateRouteTable
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param replaceNetworkAclEntry
+         */
+
+        
+                public com.amazon.ec2.ReplaceNetworkAclEntryResponse replaceNetworkAclEntry
+                (
+                  com.amazon.ec2.ReplaceNetworkAclEntry replaceNetworkAclEntry
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param authorizeSecurityGroupIngress
+         */
+
+        
+                public com.amazon.ec2.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngress
+                (
+                  com.amazon.ec2.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeSnapshotAttribute
+         */
+
+        
+                public com.amazon.ec2.DescribeSnapshotAttributeResponse describeSnapshotAttribute
+                (
+                  com.amazon.ec2.DescribeSnapshotAttribute describeSnapshotAttribute
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param createVpnGateway
+         */
+
+        
+                public com.amazon.ec2.CreateVpnGatewayResponse createVpnGateway
+                (
+                  com.amazon.ec2.CreateVpnGateway createVpnGateway
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param resetInstanceAttribute
+         */
+
+        
+                public com.amazon.ec2.ResetInstanceAttributeResponse resetInstanceAttribute
+                (
+                  com.amazon.ec2.ResetInstanceAttribute resetInstanceAttribute
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param createTags
+         */
+
+        
+                public com.amazon.ec2.CreateTagsResponse createTags
+                (
+                  com.amazon.ec2.CreateTags createTags
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param authorizeSecurityGroupEgress
+         */
+
+        
+                public com.amazon.ec2.AuthorizeSecurityGroupEgressResponse authorizeSecurityGroupEgress
+                (
+                  com.amazon.ec2.AuthorizeSecurityGroupEgress authorizeSecurityGroupEgress
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param associateAddress
+         */
+
+        
+                public com.amazon.ec2.AssociateAddressResponse associateAddress
+                (
+                  com.amazon.ec2.AssociateAddress associateAddress
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeImageAttribute
+         */
+
+        
+                public com.amazon.ec2.DescribeImageAttributeResponse describeImageAttribute
+                (
+                  com.amazon.ec2.DescribeImageAttribute describeImageAttribute
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeSpotPriceHistory
+         */
+
+        
+                public com.amazon.ec2.DescribeSpotPriceHistoryResponse describeSpotPriceHistory
+                (
+                  com.amazon.ec2.DescribeSpotPriceHistory describeSpotPriceHistory
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param modifySnapshotAttribute
+         */
+
+        
+                public com.amazon.ec2.ModifySnapshotAttributeResponse modifySnapshotAttribute
+                (
+                  com.amazon.ec2.ModifySnapshotAttribute modifySnapshotAttribute
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeSpotInstanceRequests
+         */
+
+        
+                public com.amazon.ec2.DescribeSpotInstanceRequestsResponse describeSpotInstanceRequests
+                (
+                  com.amazon.ec2.DescribeSpotInstanceRequests describeSpotInstanceRequests
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param importInstance
+         */
+
+        
+                public com.amazon.ec2.ImportInstanceResponse importInstance
+                (
+                  com.amazon.ec2.ImportInstance importInstance
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeKeyPairs
+         */
+
+        
+                public com.amazon.ec2.DescribeKeyPairsResponse describeKeyPairs
+                (
+                  com.amazon.ec2.DescribeKeyPairs describeKeyPairs
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param revokeSecurityGroupIngress
+         */
+
+        
+                public com.amazon.ec2.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngress
+                (
+                  com.amazon.ec2.RevokeSecurityGroupIngress revokeSecurityGroupIngress
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param createPlacementGroup
+         */
+
+        
+                public com.amazon.ec2.CreatePlacementGroupResponse createPlacementGroup
+                (
+                  com.amazon.ec2.CreatePlacementGroup createPlacementGroup
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param deleteNetworkAclEntry
+         */
+
+        
+                public com.amazon.ec2.DeleteNetworkAclEntryResponse deleteNetworkAclEntry
+                (
+                  com.amazon.ec2.DeleteNetworkAclEntry deleteNetworkAclEntry
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param activateLicense
+         */
+
+        
+                public com.amazon.ec2.ActivateLicenseResponse activateLicense
+                (
+                  com.amazon.ec2.ActivateLicense activateLicense
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param deleteRouteTable
+         */
+
+        
+                public com.amazon.ec2.DeleteRouteTableResponse deleteRouteTable
+                (
+                  com.amazon.ec2.DeleteRouteTable deleteRouteTable
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param unmonitorInstances
+         */
+
+        
+                public com.amazon.ec2.UnmonitorInstancesResponse unmonitorInstances
+                (
+                  com.amazon.ec2.UnmonitorInstances unmonitorInstances
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param startInstances
          */
 
         
-                public com.amazon.ec2.RegisterImageResponse registerImage
+                public com.amazon.ec2.StartInstancesResponse startInstances
                 (
-                  com.amazon.ec2.RegisterImage registerImage
+                  com.amazon.ec2.StartInstances startInstances
                  )
             ;
         
@@ -45,13 +659,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteTags
+                                    * @param confirmProductInstance
          */
 
         
-                public com.amazon.ec2.DeleteTagsResponse deleteTags
+                public com.amazon.ec2.ConfirmProductInstanceResponse confirmProductInstance
                 (
-                  com.amazon.ec2.DeleteTags deleteTags
+                  com.amazon.ec2.ConfirmProductInstance confirmProductInstance
                  )
             ;
         
@@ -59,13 +673,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createKeyPair
+                                    * @param describeNetworkInterfaceAttribute
          */
 
         
-                public com.amazon.ec2.CreateKeyPairResponse createKeyPair
+                public com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse describeNetworkInterfaceAttribute
                 (
-                  com.amazon.ec2.CreateKeyPair createKeyPair
+                  com.amazon.ec2.DescribeNetworkInterfaceAttribute describeNetworkInterfaceAttribute
                  )
             ;
         
@@ -73,13 +687,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param terminateInstances
+                                    * @param runInstances
          */
 
         
-                public com.amazon.ec2.TerminateInstancesResponse terminateInstances
+                public com.amazon.ec2.RunInstancesResponse runInstances
                 (
-                  com.amazon.ec2.TerminateInstances terminateInstances
+                  com.amazon.ec2.RunInstances runInstances
                  )
             ;
         
@@ -87,13 +701,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeImageAttribute
+                                    * @param createReservedInstancesListing
          */
 
         
-                public com.amazon.ec2.DescribeImageAttributeResponse describeImageAttribute
+                public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing
                 (
-                  com.amazon.ec2.DescribeImageAttribute describeImageAttribute
+                  com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing
                  )
             ;
         
@@ -101,13 +715,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeSecurityGroups
+                                    * @param createCustomerGateway
          */
 
         
-                public com.amazon.ec2.DescribeSecurityGroupsResponse describeSecurityGroups
+                public com.amazon.ec2.CreateCustomerGatewayResponse createCustomerGateway
                 (
-                  com.amazon.ec2.DescribeSecurityGroups describeSecurityGroups
+                  com.amazon.ec2.CreateCustomerGateway createCustomerGateway
                  )
             ;
         
@@ -115,13 +729,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describePlacementGroups
+                                    * @param createNetworkAcl
          */
 
         
-                public com.amazon.ec2.DescribePlacementGroupsResponse describePlacementGroups
+                public com.amazon.ec2.CreateNetworkAclResponse createNetworkAcl
                 (
-                  com.amazon.ec2.DescribePlacementGroups describePlacementGroups
+                  com.amazon.ec2.CreateNetworkAcl createNetworkAcl
                  )
             ;
         
@@ -129,13 +743,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createVpnConnection
+                                    * @param resetImageAttribute
          */
 
         
-                public com.amazon.ec2.CreateVpnConnectionResponse createVpnConnection
+                public com.amazon.ec2.ResetImageAttributeResponse resetImageAttribute
                 (
-                  com.amazon.ec2.CreateVpnConnection createVpnConnection
+                  com.amazon.ec2.ResetImageAttribute resetImageAttribute
                  )
             ;
         
@@ -143,13 +757,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param attachVpnGateway
+                                    * @param modifyVolumeAttribute
          */
 
         
-                public com.amazon.ec2.AttachVpnGatewayResponse attachVpnGateway
+                public com.amazon.ec2.ModifyVolumeAttributeResponse modifyVolumeAttribute
                 (
-                  com.amazon.ec2.AttachVpnGateway attachVpnGateway
+                  com.amazon.ec2.ModifyVolumeAttribute modifyVolumeAttribute
                  )
             ;
         
@@ -157,13 +771,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createVolume
+                                    * @param describeReservedInstances
          */
 
         
-                public com.amazon.ec2.CreateVolumeResponse createVolume
+                public com.amazon.ec2.DescribeReservedInstancesResponse describeReservedInstances
                 (
-                  com.amazon.ec2.CreateVolume createVolume
+                  com.amazon.ec2.DescribeReservedInstances describeReservedInstances
                  )
             ;
         
@@ -171,13 +785,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param releaseAddress
+                                    * @param resetSnapshotAttribute
          */
 
         
-                public com.amazon.ec2.ReleaseAddressResponse releaseAddress
+                public com.amazon.ec2.ResetSnapshotAttributeResponse resetSnapshotAttribute
                 (
-                  com.amazon.ec2.ReleaseAddress releaseAddress
+                  com.amazon.ec2.ResetSnapshotAttribute resetSnapshotAttribute
                  )
             ;
         
@@ -185,13 +799,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeRegions
+                                    * @param deleteVolume
          */
 
         
-                public com.amazon.ec2.DescribeRegionsResponse describeRegions
+                public com.amazon.ec2.DeleteVolumeResponse deleteVolume
                 (
-                  com.amazon.ec2.DescribeRegions describeRegions
+                  com.amazon.ec2.DeleteVolume deleteVolume
                  )
             ;
         
@@ -199,13 +813,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteSubnet
+                                    * @param describeAvailabilityZones
          */
 
         
-                public com.amazon.ec2.DeleteSubnetResponse deleteSubnet
+                public com.amazon.ec2.DescribeAvailabilityZonesResponse describeAvailabilityZones
                 (
-                  com.amazon.ec2.DeleteSubnet deleteSubnet
+                  com.amazon.ec2.DescribeAvailabilityZones describeAvailabilityZones
                  )
             ;
         
@@ -213,13 +827,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeVpcs
+                                    * @param createVpnConnection
          */
 
         
-                public com.amazon.ec2.DescribeVpcsResponse describeVpcs
+                public com.amazon.ec2.CreateVpnConnectionResponse createVpnConnection
                 (
-                  com.amazon.ec2.DescribeVpcs describeVpcs
+                  com.amazon.ec2.CreateVpnConnection createVpnConnection
                  )
             ;
         
@@ -227,13 +841,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeSpotPriceHistory
+                                    * @param cancelBundleTask
          */
 
         
-                public com.amazon.ec2.DescribeSpotPriceHistoryResponse describeSpotPriceHistory
+                public com.amazon.ec2.CancelBundleTaskResponse cancelBundleTask
                 (
-                  com.amazon.ec2.DescribeSpotPriceHistory describeSpotPriceHistory
+                  com.amazon.ec2.CancelBundleTask cancelBundleTask
                  )
             ;
         
@@ -241,13 +855,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeReservedInstances
+                                    * @param replaceNetworkAclAssociation
          */
 
         
-                public com.amazon.ec2.DescribeReservedInstancesResponse describeReservedInstances
+                public com.amazon.ec2.ReplaceNetworkAclAssociationResponse replaceNetworkAclAssociation
                 (
-                  com.amazon.ec2.DescribeReservedInstances describeReservedInstances
+                  com.amazon.ec2.ReplaceNetworkAclAssociation replaceNetworkAclAssociation
                  )
             ;
         
@@ -255,13 +869,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeTags
+                                    * @param detachVpnGateway
          */
 
         
-                public com.amazon.ec2.DescribeTagsResponse describeTags
+                public com.amazon.ec2.DetachVpnGatewayResponse detachVpnGateway
                 (
-                  com.amazon.ec2.DescribeTags describeTags
+                  com.amazon.ec2.DetachVpnGateway detachVpnGateway
                  )
             ;
         
@@ -269,13 +883,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param importVolume
+                                    * @param describeSnapshots
          */
 
         
-                public com.amazon.ec2.ImportVolumeResponse importVolume
+                public com.amazon.ec2.DescribeSnapshotsResponse describeSnapshots
                 (
-                  com.amazon.ec2.ImportVolume importVolume
+                  com.amazon.ec2.DescribeSnapshots describeSnapshots
                  )
             ;
         
@@ -283,13 +897,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeSpotDatafeedSubscription
+                                    * @param deleteSubnet
          */
 
         
-                public com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscription
+                public com.amazon.ec2.DeleteSubnetResponse deleteSubnet
                 (
-                  com.amazon.ec2.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription
+                  com.amazon.ec2.DeleteSubnet deleteSubnet
                  )
             ;
         
@@ -297,13 +911,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deactivateLicense
+                                    * @param describeBundleTasks
          */
 
         
-                public com.amazon.ec2.DeactivateLicenseResponse deactivateLicense
+                public com.amazon.ec2.DescribeBundleTasksResponse describeBundleTasks
                 (
-                  com.amazon.ec2.DeactivateLicense deactivateLicense
+                  com.amazon.ec2.DescribeBundleTasks describeBundleTasks
                  )
             ;
         
@@ -311,13 +925,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param detachVolume
+                                    * @param createKeyPair
          */
 
         
-                public com.amazon.ec2.DetachVolumeResponse detachVolume
+                public com.amazon.ec2.CreateKeyPairResponse createKeyPair
                 (
-                  com.amazon.ec2.DetachVolume detachVolume
+                  com.amazon.ec2.CreateKeyPair createKeyPair
                  )
             ;
         
@@ -325,13 +939,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeReservedInstancesOfferings
+                                    * @param createImage
          */
 
         
-                public com.amazon.ec2.DescribeReservedInstancesOfferingsResponse describeReservedInstancesOfferings
+                public com.amazon.ec2.CreateImageResponse createImage
                 (
-                  com.amazon.ec2.DescribeReservedInstancesOfferings describeReservedInstancesOfferings
+                  com.amazon.ec2.CreateImage createImage
                  )
             ;
         
@@ -339,13 +953,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeConversionTasks
+                                    * @param enableVgwRoutePropagation
          */
 
         
-                public com.amazon.ec2.DescribeConversionTasksResponse describeConversionTasks
+                public com.amazon.ec2.EnableVgwRoutePropagationResponse enableVgwRoutePropagation
                 (
-                  com.amazon.ec2.DescribeConversionTasks describeConversionTasks
+                  com.amazon.ec2.EnableVgwRoutePropagation enableVgwRoutePropagation
                  )
             ;
         
@@ -353,13 +967,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteCustomerGateway
+                                    * @param unassignPrivateIpAddresses
          */
 
         
-                public com.amazon.ec2.DeleteCustomerGatewayResponse deleteCustomerGateway
+                public com.amazon.ec2.UnassignPrivateIpAddressesResponse unassignPrivateIpAddresses
                 (
-                  com.amazon.ec2.DeleteCustomerGateway deleteCustomerGateway
+                  com.amazon.ec2.UnassignPrivateIpAddresses unassignPrivateIpAddresses
                  )
             ;
         
@@ -367,13 +981,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deletePlacementGroup
+                                    * @param deregisterImage
          */
 
         
-                public com.amazon.ec2.DeletePlacementGroupResponse deletePlacementGroup
+                public com.amazon.ec2.DeregisterImageResponse deregisterImage
                 (
-                  com.amazon.ec2.DeletePlacementGroup deletePlacementGroup
+                  com.amazon.ec2.DeregisterImage deregisterImage
                  )
             ;
         
@@ -381,13 +995,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param requestSpotInstances
+                                    * @param deleteVpnConnectionRoute
          */
 
         
-                public com.amazon.ec2.RequestSpotInstancesResponse requestSpotInstances
+                public com.amazon.ec2.DeleteVpnConnectionRouteResponse deleteVpnConnectionRoute
                 (
-                  com.amazon.ec2.RequestSpotInstances requestSpotInstances
+                  com.amazon.ec2.DeleteVpnConnectionRoute deleteVpnConnectionRoute
                  )
             ;
         
@@ -395,13 +1009,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param confirmProductInstance
+                                    * @param modifyImageAttribute
          */
 
         
-                public com.amazon.ec2.ConfirmProductInstanceResponse confirmProductInstance
+                public com.amazon.ec2.ModifyImageAttributeResponse modifyImageAttribute
                 (
-                  com.amazon.ec2.ConfirmProductInstance confirmProductInstance
+                  com.amazon.ec2.ModifyImageAttribute modifyImageAttribute
                  )
             ;
         
@@ -409,13 +1023,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param modifySnapshotAttribute
+                                    * @param cancelConversionTask
          */
 
         
-                public com.amazon.ec2.ModifySnapshotAttributeResponse modifySnapshotAttribute
+                public com.amazon.ec2.CancelConversionTaskResponse cancelConversionTask
                 (
-                  com.amazon.ec2.ModifySnapshotAttribute modifySnapshotAttribute
+                  com.amazon.ec2.CancelConversionTask cancelConversionTask
                  )
             ;
         
@@ -423,13 +1037,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param purchaseReservedInstancesOffering
+                                    * @param describeVolumes
          */
 
         
-                public com.amazon.ec2.PurchaseReservedInstancesOfferingResponse purchaseReservedInstancesOffering
+                public com.amazon.ec2.DescribeVolumesResponse describeVolumes
                 (
-                  com.amazon.ec2.PurchaseReservedInstancesOffering purchaseReservedInstancesOffering
+                  com.amazon.ec2.DescribeVolumes describeVolumes
                  )
             ;
         
@@ -437,13 +1051,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param cancelConversionTask
+                                    * @param cancelReservedInstancesListing
          */
 
         
-                public com.amazon.ec2.CancelConversionTaskResponse cancelConversionTask
+                public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing
                 (
-                  com.amazon.ec2.CancelConversionTask cancelConversionTask
+                  com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing
                  )
             ;
         
@@ -451,13 +1065,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteVpnConnection
+                                    * @param getPasswordData
          */
 
         
-                public com.amazon.ec2.DeleteVpnConnectionResponse deleteVpnConnection
+                public com.amazon.ec2.GetPasswordDataResponse getPasswordData
                 (
-                  com.amazon.ec2.DeleteVpnConnection deleteVpnConnection
+                  com.amazon.ec2.GetPasswordData getPasswordData
                  )
             ;
         
@@ -465,13 +1079,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param detachVpnGateway
+                                    * @param allocateAddress
          */
 
         
-                public com.amazon.ec2.DetachVpnGatewayResponse detachVpnGateway
+                public com.amazon.ec2.AllocateAddressResponse allocateAddress
                 (
-                  com.amazon.ec2.DetachVpnGateway detachVpnGateway
+                  com.amazon.ec2.AllocateAddress allocateAddress
                  )
             ;
         
@@ -479,13 +1093,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeCustomerGateways
+                                    * @param deleteSecurityGroup
          */
 
         
-                public com.amazon.ec2.DescribeCustomerGatewaysResponse describeCustomerGateways
+                public com.amazon.ec2.DeleteSecurityGroupResponse deleteSecurityGroup
                 (
-                  com.amazon.ec2.DescribeCustomerGateways describeCustomerGateways
+                  com.amazon.ec2.DeleteSecurityGroup deleteSecurityGroup
                  )
             ;
         
@@ -493,13 +1107,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeLicenses
+                                    * @param deletePlacementGroup
          */
 
         
-                public com.amazon.ec2.DescribeLicensesResponse describeLicenses
+                public com.amazon.ec2.DeletePlacementGroupResponse deletePlacementGroup
                 (
-                  com.amazon.ec2.DescribeLicenses describeLicenses
+                  com.amazon.ec2.DeletePlacementGroup deletePlacementGroup
                  )
             ;
         
@@ -507,13 +1121,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param revokeSecurityGroupIngress
+                                    * @param disassociateAddress
          */
 
         
-                public com.amazon.ec2.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngress
+                public com.amazon.ec2.DisassociateAddressResponse disassociateAddress
                 (
-                  com.amazon.ec2.RevokeSecurityGroupIngress revokeSecurityGroupIngress
+                  com.amazon.ec2.DisassociateAddress disassociateAddress
                  )
             ;
         
@@ -521,13 +1135,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeSubnets
+                                    * @param deleteDhcpOptions
          */
 
         
-                public com.amazon.ec2.DescribeSubnetsResponse describeSubnets
+                public com.amazon.ec2.DeleteDhcpOptionsResponse deleteDhcpOptions
                 (
-                  com.amazon.ec2.DescribeSubnets describeSubnets
+                  com.amazon.ec2.DeleteDhcpOptions deleteDhcpOptions
                  )
             ;
         
@@ -535,13 +1149,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param resetSnapshotAttribute
+                                    * @param describeSpotDatafeedSubscription
          */
 
         
-                public com.amazon.ec2.ResetSnapshotAttributeResponse resetSnapshotAttribute
+                public com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscription
                 (
-                  com.amazon.ec2.ResetSnapshotAttribute resetSnapshotAttribute
+                  com.amazon.ec2.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription
                  )
             ;
         
@@ -549,13 +1163,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeAddresses
+                                    * @param describeNetworkAcls
          */
 
         
-                public com.amazon.ec2.DescribeAddressesResponse describeAddresses
+                public com.amazon.ec2.DescribeNetworkAclsResponse describeNetworkAcls
                 (
-                  com.amazon.ec2.DescribeAddresses describeAddresses
+                  com.amazon.ec2.DescribeNetworkAcls describeNetworkAcls
                  )
             ;
         
@@ -563,13 +1177,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createSecurityGroup
+                                    * @param enableVolumeIO
          */
 
         
-                public com.amazon.ec2.CreateSecurityGroupResponse createSecurityGroup
+                public com.amazon.ec2.EnableVolumeIOResponse enableVolumeIO
                 (
-                  com.amazon.ec2.CreateSecurityGroup createSecurityGroup
+                  com.amazon.ec2.EnableVolumeIO enableVolumeIO
                  )
             ;
         
@@ -577,13 +1191,69 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param allocateAddress
+                                    * @param attachVpnGateway
          */
 
         
-                public com.amazon.ec2.AllocateAddressResponse allocateAddress
+                public com.amazon.ec2.AttachVpnGatewayResponse attachVpnGateway
+                (
+                  com.amazon.ec2.AttachVpnGateway attachVpnGateway
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeInternetGateways
+         */
+
+        
+                public com.amazon.ec2.DescribeInternetGatewaysResponse describeInternetGateways
+                (
+                  com.amazon.ec2.DescribeInternetGateways describeInternetGateways
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeDhcpOptions
+         */
+
+        
+                public com.amazon.ec2.DescribeDhcpOptionsResponse describeDhcpOptions
+                (
+                  com.amazon.ec2.DescribeDhcpOptions describeDhcpOptions
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param createSpotDatafeedSubscription
+         */
+
+        
+                public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription
+                (
+                  com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription
+                 )
+            ;
+        
+         
+        /**
+         * Auto generated method signature
+         * 
+                                    * @param describeReservedInstancesListings
+         */
+
+        
+                public com.amazon.ec2.DescribeReservedInstancesListingsResponse describeReservedInstancesListings
                 (
-                  com.amazon.ec2.AllocateAddress allocateAddress
+                  com.amazon.ec2.DescribeReservedInstancesListings describeReservedInstancesListings
                  )
             ;
         
@@ -591,13 +1261,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param importKeyPair
+                                    * @param describeInstanceStatus
          */
 
         
-                public com.amazon.ec2.ImportKeyPairResponse importKeyPair
+                public com.amazon.ec2.DescribeInstanceStatusResponse describeInstanceStatus
                 (
-                  com.amazon.ec2.ImportKeyPair importKeyPair
+                  com.amazon.ec2.DescribeInstanceStatus describeInstanceStatus
                  )
             ;
         
@@ -605,13 +1275,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createTags
+                                    * @param modifyNetworkInterfaceAttribute
          */
 
         
-                public com.amazon.ec2.CreateTagsResponse createTags
+                public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute
                 (
-                  com.amazon.ec2.CreateTags createTags
+                  com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute
                  )
             ;
         
@@ -619,13 +1289,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param startInstances
+                                    * @param disableVgwRoutePropagation
          */
 
         
-                public com.amazon.ec2.StartInstancesResponse startInstances
+                public com.amazon.ec2.DisableVgwRoutePropagationResponse disableVgwRoutePropagation
                 (
-                  com.amazon.ec2.StartInstances startInstances
+                  com.amazon.ec2.DisableVgwRoutePropagation disableVgwRoutePropagation
                  )
             ;
         
@@ -633,13 +1303,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeVpnConnections
+                                    * @param describeVolumeStatus
          */
 
         
-                public com.amazon.ec2.DescribeVpnConnectionsResponse describeVpnConnections
+                public com.amazon.ec2.DescribeVolumeStatusResponse describeVolumeStatus
                 (
-                  com.amazon.ec2.DescribeVpnConnections describeVpnConnections
+                  com.amazon.ec2.DescribeVolumeStatus describeVolumeStatus
                  )
             ;
         
@@ -647,13 +1317,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param rebootInstances
+                                    * @param detachNetworkInterface
          */
 
         
-                public com.amazon.ec2.RebootInstancesResponse rebootInstances
+                public com.amazon.ec2.DetachNetworkInterfaceResponse detachNetworkInterface
                 (
-                  com.amazon.ec2.RebootInstances rebootInstances
+                  com.amazon.ec2.DetachNetworkInterface detachNetworkInterface
                  )
             ;
         
@@ -661,13 +1331,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeAvailabilityZones
+                                    * @param describeSecurityGroups
          */
 
         
-                public com.amazon.ec2.DescribeAvailabilityZonesResponse describeAvailabilityZones
+                public com.amazon.ec2.DescribeSecurityGroupsResponse describeSecurityGroups
                 (
-                  com.amazon.ec2.DescribeAvailabilityZones describeAvailabilityZones
+                  com.amazon.ec2.DescribeSecurityGroups describeSecurityGroups
                  )
             ;
         
@@ -675,13 +1345,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param bundleInstance
+                                    * @param describeInstances
          */
 
         
-                public com.amazon.ec2.BundleInstanceResponse bundleInstance
+                public com.amazon.ec2.DescribeInstancesResponse describeInstances
                 (
-                  com.amazon.ec2.BundleInstance bundleInstance
+                  com.amazon.ec2.DescribeInstances describeInstances
                  )
             ;
         
@@ -689,13 +1359,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param activateLicense
+                                    * @param describeNetworkInterfaces
          */
 
         
-                public com.amazon.ec2.ActivateLicenseResponse activateLicense
+                public com.amazon.ec2.DescribeNetworkInterfacesResponse describeNetworkInterfaces
                 (
-                  com.amazon.ec2.ActivateLicense activateLicense
+                  com.amazon.ec2.DescribeNetworkInterfaces describeNetworkInterfaces
                  )
             ;
         
@@ -703,13 +1373,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeSnapshots
+                                    * @param deleteKeyPair
          */
 
         
-                public com.amazon.ec2.DescribeSnapshotsResponse describeSnapshots
+                public com.amazon.ec2.DeleteKeyPairResponse deleteKeyPair
                 (
-                  com.amazon.ec2.DescribeSnapshots describeSnapshots
+                  com.amazon.ec2.DeleteKeyPair deleteKeyPair
                  )
             ;
         
@@ -717,13 +1387,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createPlacementGroup
+                                    * @param createSnapshot
          */
 
         
-                public com.amazon.ec2.CreatePlacementGroupResponse createPlacementGroup
+                public com.amazon.ec2.CreateSnapshotResponse createSnapshot
                 (
-                  com.amazon.ec2.CreatePlacementGroup createPlacementGroup
+                  com.amazon.ec2.CreateSnapshot createSnapshot
                  )
             ;
         
@@ -731,13 +1401,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeSpotInstanceRequests
+                                    * @param describeVpnGateways
          */
 
         
-                public com.amazon.ec2.DescribeSpotInstanceRequestsResponse describeSpotInstanceRequests
+                public com.amazon.ec2.DescribeVpnGatewaysResponse describeVpnGateways
                 (
-                  com.amazon.ec2.DescribeSpotInstanceRequests describeSpotInstanceRequests
+                  com.amazon.ec2.DescribeVpnGateways describeVpnGateways
                  )
             ;
         
@@ -745,13 +1415,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param associateAddress
+                                    * @param deleteTags
          */
 
         
-                public com.amazon.ec2.AssociateAddressResponse associateAddress
+                public com.amazon.ec2.DeleteTagsResponse deleteTags
                 (
-                  com.amazon.ec2.AssociateAddress associateAddress
+                  com.amazon.ec2.DeleteTags deleteTags
                  )
             ;
         
@@ -759,13 +1429,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param runInstances
+                                    * @param deleteSnapshot
          */
 
         
-                public com.amazon.ec2.RunInstancesResponse runInstances
+                public com.amazon.ec2.DeleteSnapshotResponse deleteSnapshot
                 (
-                  com.amazon.ec2.RunInstances runInstances
+                  com.amazon.ec2.DeleteSnapshot deleteSnapshot
                  )
             ;
         
@@ -773,13 +1443,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteSecurityGroup
+                                    * @param deleteCustomerGateway
          */
 
         
-                public com.amazon.ec2.DeleteSecurityGroupResponse deleteSecurityGroup
+                public com.amazon.ec2.DeleteCustomerGatewayResponse deleteCustomerGateway
                 (
-                  com.amazon.ec2.DeleteSecurityGroup deleteSecurityGroup
+                  com.amazon.ec2.DeleteCustomerGateway deleteCustomerGateway
                  )
             ;
         
@@ -787,13 +1457,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteVpc
+                                    * @param createVolume
          */
 
         
-                public com.amazon.ec2.DeleteVpcResponse deleteVpc
+                public com.amazon.ec2.CreateVolumeResponse createVolume
                 (
-                  com.amazon.ec2.DeleteVpc deleteVpc
+                  com.amazon.ec2.CreateVolume createVolume
                  )
             ;
         
@@ -801,13 +1471,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteVolume
+                                    * @param cancelExportTask
          */
 
         
-                public com.amazon.ec2.DeleteVolumeResponse deleteVolume
+                public com.amazon.ec2.CancelExportTaskResponse cancelExportTask
                 (
-                  com.amazon.ec2.DeleteVolume deleteVolume
+                  com.amazon.ec2.CancelExportTask cancelExportTask
                  )
             ;
         
@@ -815,13 +1485,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createVpnGateway
+                                    * @param registerImage
          */
 
         
-                public com.amazon.ec2.CreateVpnGatewayResponse createVpnGateway
+                public com.amazon.ec2.RegisterImageResponse registerImage
                 (
-                  com.amazon.ec2.CreateVpnGateway createVpnGateway
+                  com.amazon.ec2.RegisterImage registerImage
                  )
             ;
         
@@ -829,13 +1499,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param resetInstanceAttribute
+                                    * @param detachVolume
          */
 
         
-                public com.amazon.ec2.ResetInstanceAttributeResponse resetInstanceAttribute
+                public com.amazon.ec2.DetachVolumeResponse detachVolume
                 (
-                  com.amazon.ec2.ResetInstanceAttribute resetInstanceAttribute
+                  com.amazon.ec2.DetachVolume detachVolume
                  )
             ;
         
@@ -843,13 +1513,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createVpc
+                                    * @param stopInstances
          */
 
         
-                public com.amazon.ec2.CreateVpcResponse createVpc
+                public com.amazon.ec2.StopInstancesResponse stopInstances
                 (
-                  com.amazon.ec2.CreateVpc createVpc
+                  com.amazon.ec2.StopInstances stopInstances
                  )
             ;
         
@@ -857,13 +1527,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteKeyPair
+                                    * @param createRoute
          */
 
         
-                public com.amazon.ec2.DeleteKeyPairResponse deleteKeyPair
+                public com.amazon.ec2.CreateRouteResponse createRoute
                 (
-                  com.amazon.ec2.DeleteKeyPair deleteKeyPair
+                  com.amazon.ec2.CreateRoute createRoute
                  )
             ;
         
@@ -871,13 +1541,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param stopInstances
+                                    * @param releaseAddress
          */
 
         
-                public com.amazon.ec2.StopInstancesResponse stopInstances
+                public com.amazon.ec2.ReleaseAddressResponse releaseAddress
                 (
-                  com.amazon.ec2.StopInstances stopInstances
+                  com.amazon.ec2.ReleaseAddress releaseAddress
                  )
             ;
         
@@ -885,13 +1555,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createImage
+                                    * @param describeRouteTables
          */
 
         
-                public com.amazon.ec2.CreateImageResponse createImage
+                public com.amazon.ec2.DescribeRouteTablesResponse describeRouteTables
                 (
-                  com.amazon.ec2.CreateImage createImage
+                  com.amazon.ec2.DescribeRouteTables describeRouteTables
                  )
             ;
         
@@ -899,13 +1569,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeVolumes
+                                    * @param describeCustomerGateways
          */
 
         
-                public com.amazon.ec2.DescribeVolumesResponse describeVolumes
+                public com.amazon.ec2.DescribeCustomerGatewaysResponse describeCustomerGateways
                 (
-                  com.amazon.ec2.DescribeVolumes describeVolumes
+                  com.amazon.ec2.DescribeCustomerGateways describeCustomerGateways
                  )
             ;
         
@@ -913,13 +1583,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeKeyPairs
+                                    * @param deleteNetworkAcl
          */
 
         
-                public com.amazon.ec2.DescribeKeyPairsResponse describeKeyPairs
+                public com.amazon.ec2.DeleteNetworkAclResponse deleteNetworkAcl
                 (
-                  com.amazon.ec2.DescribeKeyPairs describeKeyPairs
+                  com.amazon.ec2.DeleteNetworkAcl deleteNetworkAcl
                  )
             ;
         
@@ -927,13 +1597,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createCustomerGateway
+                                    * @param deleteRoute
          */
 
         
-                public com.amazon.ec2.CreateCustomerGatewayResponse createCustomerGateway
+                public com.amazon.ec2.DeleteRouteResponse deleteRoute
                 (
-                  com.amazon.ec2.CreateCustomerGateway createCustomerGateway
+                  com.amazon.ec2.DeleteRoute deleteRoute
                  )
             ;
         
@@ -941,13 +1611,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeImages
+                                    * @param rebootInstances
          */
 
         
-                public com.amazon.ec2.DescribeImagesResponse describeImages
+                public com.amazon.ec2.RebootInstancesResponse rebootInstances
                 (
-                  com.amazon.ec2.DescribeImages describeImages
+                  com.amazon.ec2.RebootInstances rebootInstances
                  )
             ;
         
@@ -955,13 +1625,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createSubnet
+                                    * @param modifyInstanceAttribute
          */
 
         
-                public com.amazon.ec2.CreateSubnetResponse createSubnet
+                public com.amazon.ec2.ModifyInstanceAttributeResponse modifyInstanceAttribute
                 (
-                  com.amazon.ec2.CreateSubnet createSubnet
+                  com.amazon.ec2.ModifyInstanceAttribute modifyInstanceAttribute
                  )
             ;
         
@@ -969,13 +1639,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param disassociateAddress
+                                    * @param terminateInstances
          */
 
         
-                public com.amazon.ec2.DisassociateAddressResponse disassociateAddress
+                public com.amazon.ec2.TerminateInstancesResponse terminateInstances
                 (
-                  com.amazon.ec2.DisassociateAddress disassociateAddress
+                  com.amazon.ec2.TerminateInstances terminateInstances
                  )
             ;
         
@@ -983,13 +1653,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteVpnGateway
+                                    * @param createVpnConnectionRoute
          */
 
         
-                public com.amazon.ec2.DeleteVpnGatewayResponse deleteVpnGateway
+                public com.amazon.ec2.CreateVpnConnectionRouteResponse createVpnConnectionRoute
                 (
-                  com.amazon.ec2.DeleteVpnGateway deleteVpnGateway
+                  com.amazon.ec2.CreateVpnConnectionRoute createVpnConnectionRoute
                  )
             ;
         
@@ -997,13 +1667,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param cancelSpotInstanceRequests
+                                    * @param describeConversionTasks
          */
 
         
-                public com.amazon.ec2.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequests
+                public com.amazon.ec2.DescribeConversionTasksResponse describeConversionTasks
                 (
-                  com.amazon.ec2.CancelSpotInstanceRequests cancelSpotInstanceRequests
+                  com.amazon.ec2.DescribeConversionTasks describeConversionTasks
                  )
             ;
         
@@ -1011,13 +1681,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param monitorInstances
+                                    * @param describeAddresses
          */
 
         
-                public com.amazon.ec2.MonitorInstancesResponse monitorInstances
+                public com.amazon.ec2.DescribeAddressesResponse describeAddresses
                 (
-                  com.amazon.ec2.MonitorInstances monitorInstances
+                  com.amazon.ec2.DescribeAddresses describeAddresses
                  )
             ;
         
@@ -1025,13 +1695,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createSnapshot
+                                    * @param describeInstanceAttribute
          */
 
         
-                public com.amazon.ec2.CreateSnapshotResponse createSnapshot
+                public com.amazon.ec2.DescribeInstanceAttributeResponse describeInstanceAttribute
                 (
-                  com.amazon.ec2.CreateSnapshot createSnapshot
+                  com.amazon.ec2.DescribeInstanceAttribute describeInstanceAttribute
                  )
             ;
         
@@ -1039,13 +1709,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param resetImageAttribute
+                                    * @param attachInternetGateway
          */
 
         
-                public com.amazon.ec2.ResetImageAttributeResponse resetImageAttribute
+                public com.amazon.ec2.AttachInternetGatewayResponse attachInternetGateway
                 (
-                  com.amazon.ec2.ResetImageAttribute resetImageAttribute
+                  com.amazon.ec2.AttachInternetGateway attachInternetGateway
                  )
             ;
         
@@ -1053,13 +1723,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param attachVolume
+                                    * @param createVpc
          */
 
         
-                public com.amazon.ec2.AttachVolumeResponse attachVolume
+                public com.amazon.ec2.CreateVpcResponse createVpc
                 (
-                  com.amazon.ec2.AttachVolume attachVolume
+                  com.amazon.ec2.CreateVpc createVpc
                  )
             ;
         
@@ -1067,13 +1737,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeInstanceAttribute
+                                    * @param replaceRouteTableAssociation
          */
 
         
-                public com.amazon.ec2.DescribeInstanceAttributeResponse describeInstanceAttribute
+                public com.amazon.ec2.ReplaceRouteTableAssociationResponse replaceRouteTableAssociation
                 (
-                  com.amazon.ec2.DescribeInstanceAttribute describeInstanceAttribute
+                  com.amazon.ec2.ReplaceRouteTableAssociation replaceRouteTableAssociation
                  )
             ;
         
@@ -1081,13 +1751,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param authorizeSecurityGroupIngress
+                                    * @param associateRouteTable
          */
 
         
-                public com.amazon.ec2.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngress
+                public com.amazon.ec2.AssociateRouteTableResponse associateRouteTable
                 (
-                  com.amazon.ec2.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress
+                  com.amazon.ec2.AssociateRouteTable associateRouteTable
                  )
             ;
         
@@ -1095,13 +1765,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param modifyInstanceAttribute
+                                    * @param detachInternetGateway
          */
 
         
-                public com.amazon.ec2.ModifyInstanceAttributeResponse modifyInstanceAttribute
+                public com.amazon.ec2.DetachInternetGatewayResponse detachInternetGateway
                 (
-                  com.amazon.ec2.ModifyInstanceAttribute modifyInstanceAttribute
+                  com.amazon.ec2.DetachInternetGateway detachInternetGateway
                  )
             ;
         
@@ -1109,13 +1779,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeSnapshotAttribute
+                                    * @param purchaseReservedInstancesOffering
          */
 
         
-                public com.amazon.ec2.DescribeSnapshotAttributeResponse describeSnapshotAttribute
+                public com.amazon.ec2.PurchaseReservedInstancesOfferingResponse purchaseReservedInstancesOffering
                 (
-                  com.amazon.ec2.DescribeSnapshotAttribute describeSnapshotAttribute
+                  com.amazon.ec2.PurchaseReservedInstancesOffering purchaseReservedInstancesOffering
                  )
             ;
         
@@ -1123,13 +1793,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param getConsoleOutput
+                                    * @param importVolume
          */
 
         
-                public com.amazon.ec2.GetConsoleOutputResponse getConsoleOutput
+                public com.amazon.ec2.ImportVolumeResponse importVolume
                 (
-                  com.amazon.ec2.GetConsoleOutput getConsoleOutput
+                  com.amazon.ec2.ImportVolume importVolume
                  )
             ;
         
@@ -1137,13 +1807,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeDhcpOptions
+                                    * @param describeExportTasks
          */
 
         
-                public com.amazon.ec2.DescribeDhcpOptionsResponse describeDhcpOptions
+                public com.amazon.ec2.DescribeExportTasksResponse describeExportTasks
                 (
-                  com.amazon.ec2.DescribeDhcpOptions describeDhcpOptions
+                  com.amazon.ec2.DescribeExportTasks describeExportTasks
                  )
             ;
         
@@ -1151,13 +1821,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param cancelBundleTask
+                                    * @param createInstanceExportTask
          */
 
         
-                public com.amazon.ec2.CancelBundleTaskResponse cancelBundleTask
+                public com.amazon.ec2.CreateInstanceExportTaskResponse createInstanceExportTask
                 (
-                  com.amazon.ec2.CancelBundleTask cancelBundleTask
+                  com.amazon.ec2.CreateInstanceExportTask createInstanceExportTask
                  )
             ;
         
@@ -1165,13 +1835,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteSnapshot
+                                    * @param assignPrivateIpAddresses
          */
 
         
-                public com.amazon.ec2.DeleteSnapshotResponse deleteSnapshot
+                public com.amazon.ec2.AssignPrivateIpAddressesResponse assignPrivateIpAddresses
                 (
-                  com.amazon.ec2.DeleteSnapshot deleteSnapshot
+                  com.amazon.ec2.AssignPrivateIpAddresses assignPrivateIpAddresses
                  )
             ;
         
@@ -1179,13 +1849,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createSpotDatafeedSubscription
+                                    * @param reportInstanceStatus
          */
 
         
-                public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription
+                public com.amazon.ec2.ReportInstanceStatusResponse reportInstanceStatus
                 (
-                  com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription
+                  com.amazon.ec2.ReportInstanceStatus reportInstanceStatus
                  )
             ;
         
@@ -1193,13 +1863,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteSpotDatafeedSubscription
+                                    * @param describeReservedInstancesOfferings
          */
 
         
-                public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription
+                public com.amazon.ec2.DescribeReservedInstancesOfferingsResponse describeReservedInstancesOfferings
                 (
-                  com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription
+                  com.amazon.ec2.DescribeReservedInstancesOfferings describeReservedInstancesOfferings
                  )
             ;
         
@@ -1207,13 +1877,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deregisterImage
+                                    * @param deleteVpnConnection
          */
 
         
-                public com.amazon.ec2.DeregisterImageResponse deregisterImage
+                public com.amazon.ec2.DeleteVpnConnectionResponse deleteVpnConnection
                 (
-                  com.amazon.ec2.DeregisterImage deregisterImage
+                  com.amazon.ec2.DeleteVpnConnection deleteVpnConnection
                  )
             ;
         
@@ -1221,13 +1891,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeBundleTasks
+                                    * @param deleteInternetGateway
          */
 
         
-                public com.amazon.ec2.DescribeBundleTasksResponse describeBundleTasks
+                public com.amazon.ec2.DeleteInternetGatewayResponse deleteInternetGateway
                 (
-                  com.amazon.ec2.DescribeBundleTasks describeBundleTasks
+                  com.amazon.ec2.DeleteInternetGateway deleteInternetGateway
                  )
             ;
         
@@ -1235,13 +1905,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param createDhcpOptions
+                                    * @param deleteSpotDatafeedSubscription
          */
 
         
-                public com.amazon.ec2.CreateDhcpOptionsResponse createDhcpOptions
+                public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription
                 (
-                  com.amazon.ec2.CreateDhcpOptions createDhcpOptions
+                  com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription
                  )
             ;
         
@@ -1249,13 +1919,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param modifyImageAttribute
+                                    * @param attachNetworkInterface
          */
 
         
-                public com.amazon.ec2.ModifyImageAttributeResponse modifyImageAttribute
+                public com.amazon.ec2.AttachNetworkInterfaceResponse attachNetworkInterface
                 (
-                  com.amazon.ec2.ModifyImageAttribute modifyImageAttribute
+                  com.amazon.ec2.AttachNetworkInterface attachNetworkInterface
                  )
             ;
         
@@ -1263,13 +1933,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeInstances
+                                    * @param createNetworkInterface
          */
 
         
-                public com.amazon.ec2.DescribeInstancesResponse describeInstances
+                public com.amazon.ec2.CreateNetworkInterfaceResponse createNetworkInterface
                 (
-                  com.amazon.ec2.DescribeInstances describeInstances
+                  com.amazon.ec2.CreateNetworkInterface createNetworkInterface
                  )
             ;
         
@@ -1277,13 +1947,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param describeVpnGateways
+                                    * @param revokeSecurityGroupEgress
          */
 
         
-                public com.amazon.ec2.DescribeVpnGatewaysResponse describeVpnGateways
+                public com.amazon.ec2.RevokeSecurityGroupEgressResponse revokeSecurityGroupEgress
                 (
-                  com.amazon.ec2.DescribeVpnGateways describeVpnGateways
+                  com.amazon.ec2.RevokeSecurityGroupEgress revokeSecurityGroupEgress
                  )
             ;
         
@@ -1291,13 +1961,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param deleteDhcpOptions
+                                    * @param monitorInstances
          */
 
         
-                public com.amazon.ec2.DeleteDhcpOptionsResponse deleteDhcpOptions
+                public com.amazon.ec2.MonitorInstancesResponse monitorInstances
                 (
-                  com.amazon.ec2.DeleteDhcpOptions deleteDhcpOptions
+                  com.amazon.ec2.MonitorInstances monitorInstances
                  )
             ;
         
@@ -1305,13 +1975,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param importInstance
+                                    * @param replaceRoute
          */
 
         
-                public com.amazon.ec2.ImportInstanceResponse importInstance
+                public com.amazon.ec2.ReplaceRouteResponse replaceRoute
                 (
-                  com.amazon.ec2.ImportInstance importInstance
+                  com.amazon.ec2.ReplaceRoute replaceRoute
                  )
             ;
         
@@ -1319,13 +1989,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param associateDhcpOptions
+                                    * @param attachVolume
          */
 
         
-                public com.amazon.ec2.AssociateDhcpOptionsResponse associateDhcpOptions
+                public com.amazon.ec2.AttachVolumeResponse attachVolume
                 (
-                  com.amazon.ec2.AssociateDhcpOptions associateDhcpOptions
+                  com.amazon.ec2.AttachVolume attachVolume
                  )
             ;
         
@@ -1333,13 +2003,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param unmonitorInstances
+                                    * @param getConsoleOutput
          */
 
         
-                public com.amazon.ec2.UnmonitorInstancesResponse unmonitorInstances
+                public com.amazon.ec2.GetConsoleOutputResponse getConsoleOutput
                 (
-                  com.amazon.ec2.UnmonitorInstances unmonitorInstances
+                  com.amazon.ec2.GetConsoleOutput getConsoleOutput
                  )
             ;
         
@@ -1347,13 +2017,13 @@
         /**
          * Auto generated method signature
          * 
-                                    * @param getPasswordData
+                                    * @param describeRegions
          */
 
         
-                public com.amazon.ec2.GetPasswordDataResponse getPasswordData
+                public com.amazon.ec2.DescribeRegionsResponse describeRegions
                 (
-                  com.amazon.ec2.GetPasswordData getPasswordData
+                  com.amazon.ec2.DescribeRegions describeRegions
                  )
             ;
         


[48/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocationIdSetType.java b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
new file mode 100644
index 0000000..67d34bc
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
@@ -0,0 +1,560 @@
+
+/**
+ * AllocationIdSetType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AllocationIdSetType bean class
+            */
+        
+        public  class AllocationIdSetType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AllocationIdSetType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for Item
+                        * This was an Array!
+                        */
+
+                        
+                                    protected com.amazon.ec2.AllocationIdSetItemType[] localItem ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localItemTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AllocationIdSetItemType[]
+                           */
+                           public  com.amazon.ec2.AllocationIdSetItemType[] getItem(){
+                               return localItem;
+                           }
+
+                           
+                        
+
+
+                               
+                              /**
+                               * validate the array for Item
+                               */
+                              protected void validateItem(com.amazon.ec2.AllocationIdSetItemType[] param){
+                             
+                              }
+
+
+                             /**
+                              * Auto generated setter method
+                              * @param param Item
+                              */
+                              public void setItem(com.amazon.ec2.AllocationIdSetItemType[] param){
+                              
+                                   validateItem(param);
+
+                               
+                                          if (param != null){
+                                             //update the setting tracker
+                                             localItemTracker = true;
+                                          } else {
+                                             localItemTracker = false;
+                                                 
+                                          }
+                                      
+                                      this.localItem=param;
+                              }
+
+                               
+                             
+                             /**
+                             * Auto generated add method for the array for convenience
+                             * @param param com.amazon.ec2.AllocationIdSetItemType
+                             */
+                             public void addItem(com.amazon.ec2.AllocationIdSetItemType param){
+                                   if (localItem == null){
+                                   localItem = new com.amazon.ec2.AllocationIdSetItemType[]{};
+                                   }
+
+                            
+                                 //update the setting tracker
+                                localItemTracker = true;
+                            
+
+                               java.util.List list =
+                            org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
+                               list.add(param);
+                               this.localItem =
+                             (com.amazon.ec2.AllocationIdSetItemType[])list.toArray(
+                            new com.amazon.ec2.AllocationIdSetItemType[list.size()]);
+
+                             }
+                             
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AllocationIdSetType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AllocationIdSetType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AllocationIdSetType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+                if (localItemTracker){
+                                       if (localItem!=null){
+                                            for (int i = 0;i < localItem.length;i++){
+                                                if (localItem[i] != null){
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
+                                                           factory,xmlWriter);
+                                                } else {
+                                                   
+                                                        // we don't have to do any thing since minOccures is zero
+                                                    
+                                                }
+
+                                            }
+                                     } else {
+                                        
+                                               throw new org.apache.axis2.databinding.ADBException("item cannot be null!!");
+                                        
+                                    }
+                                 }
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                 if (localItemTracker){
+                             if (localItem!=null) {
+                                 for (int i = 0;i < localItem.length;i++){
+
+                                    if (localItem[i] != null){
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                          "item"));
+                                         elementList.add(localItem[i]);
+                                    } else {
+                                        
+                                                // nothing to do
+                                            
+                                    }
+
+                                 }
+                             } else {
+                                 
+                                        throw new org.apache.axis2.databinding.ADBException("item cannot be null!!");
+                                    
+                             }
+
+                        }
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AllocationIdSetType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AllocationIdSetType object =
+                new AllocationIdSetType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AllocationIdSetType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AllocationIdSetType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                        java.util.ArrayList list1 = new java.util.ArrayList();
+                    
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
+                                
+                                    
+                                    
+                                    // Process the array and step past its final element's end.
+                                    list1.add(com.amazon.ec2.AllocationIdSetItemType.Factory.parse(reader));
+                                                                
+                                                        //loop until we find a start element that is not part of this array
+                                                        boolean loopDone1 = false;
+                                                        while(!loopDone1){
+                                                            // We should be at the end element, but make sure
+                                                            while (!reader.isEndElement())
+                                                                reader.next();
+                                                            // Step out of this element
+                                                            reader.next();
+                                                            // Step to next element event.
+                                                            while (!reader.isStartElement() && !reader.isEndElement())
+                                                                reader.next();
+                                                            if (reader.isEndElement()){
+                                                                //two continuous end elements means we are exiting the xml structure
+                                                                loopDone1 = true;
+                                                            } else {
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
+                                                                    list1.add(com.amazon.ec2.AllocationIdSetItemType.Factory.parse(reader));
+                                                                        
+                                                                }else{
+                                                                    loopDone1 = true;
+                                                                }
+                                                            }
+                                                        }
+                                                        // call the converter utility  to convert and set the array
+                                                        
+                                                        object.setItem((com.amazon.ec2.AllocationIdSetItemType[])
+                                                            org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+                                                                com.amazon.ec2.AllocationIdSetItemType.class,
+                                                                list1));
+                                                            
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                  
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[30/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
index 1334e03..d0676bc 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ConversionTaskTypeChoice_type0.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = ConversionTaskTypeChoice_type0
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":ConversionTaskTypeChoice_type0",
@@ -229,13 +213,13 @@
                                             if (localImportVolume==null){
                                                  throw new org.apache.axis2.databinding.ADBException("importVolume cannot be null!!");
                                             }
-                                           localImportVolume.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","importVolume"),
+                                           localImportVolume.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","importVolume"),
                                                factory,xmlWriter);
                                         } if (localImportInstanceTracker){
                                             if (localImportInstance==null){
                                                  throw new org.apache.axis2.databinding.ADBException("importInstance cannot be null!!");
                                             }
-                                           localImportInstance.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","importInstance"),
+                                           localImportInstance.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","importInstance"),
                                                factory,xmlWriter);
                                         }
 
@@ -398,7 +382,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                  if (localImportVolumeTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "importVolume"));
                             
                             
@@ -407,7 +391,7 @@
                                     }
                                     elementList.add(localImportVolume);
                                 } if (localImportInstanceTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "importInstance"));
                             
                             
@@ -462,7 +446,7 @@
                 
 
                  
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","importVolume").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","importVolume").equals(reader.getName())){
                                 
                                                 object.setImportVolume(com.amazon.ec2.ImportVolumeTaskDetailsType.Factory.parse(reader));
                                               
@@ -472,7 +456,7 @@
                                 
                                         else
                                     
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","importInstance").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","importInstance").equals(reader.getName())){
                                 
                                                 object.setImportInstance(com.amazon.ec2.ImportInstanceTaskDetailsType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
index 3f3fead..c426e35 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateCustomerGateway.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateCustomerGateway",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateCustomerGateway").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateCustomerGateway").equals(reader.getName())){
                                 
                                                 object.setCreateCustomerGateway(com.amazon.ec2.CreateCustomerGatewayType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
index 7db1f8b..69e485a 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateCustomerGatewayResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateCustomerGatewayResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateCustomerGatewayResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateCustomerGatewayResponse").equals(reader.getName())){
                                 
                                                 object.setCreateCustomerGatewayResponse(com.amazon.ec2.CreateCustomerGatewayResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
index 29956db..4ad9835 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateCustomerGatewayResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateCustomerGatewayResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateCustomerGatewayResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localCustomerGateway==null){
                                                  throw new org.apache.axis2.databinding.ADBException("customerGateway cannot be null!!");
                                             }
-                                           localCustomerGateway.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","customerGateway"),
+                                           localCustomerGateway.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","customerGateway"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "customerGateway"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","customerGateway").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","customerGateway").equals(reader.getName())){
                                 
                                                 object.setCustomerGateway(com.amazon.ec2.CustomerGatewayType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
index f183a61..086ccbf 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateCustomerGatewayType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateCustomerGatewayType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -114,6 +98,12 @@
                         
                                     protected int localBgpAsn ;
                                 
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localBgpAsnTracker = false ;
+                           
 
                            /**
                            * Auto generated getter method
@@ -131,6 +121,15 @@
                                */
                                public void setBgpAsn(int param){
                             
+                                       // setting primitive attribute tracker to true
+                                       
+                                               if (param==java.lang.Integer.MIN_VALUE) {
+                                           localBgpAsnTracker = false;
+                                              
+                                       } else {
+                                          localBgpAsnTracker = true;
+                                       }
+                                   
                                             this.localBgpAsn=param;
                                     
 
@@ -220,7 +219,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateCustomerGatewayType",
@@ -234,7 +233,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -268,7 +267,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -301,8 +300,8 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                              if (localBgpAsnTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -330,7 +329,7 @@
                                                }
                                     
                                    xmlWriter.writeEndElement();
-                             
+                             }
                     xmlWriter.writeEndElement();
                
 
@@ -493,7 +492,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "type"));
                                  
                                         if (localType != null){
@@ -502,7 +501,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("type cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "ipAddress"));
                                  
                                         if (localIpAddress != null){
@@ -510,13 +509,13 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("ipAddress cannot be null!!");
                                         }
-                                    
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                     if (localBgpAsnTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bgpAsn"));
                                  
                                 elementList.add(
                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localBgpAsn));
-                            
+                            }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -595,7 +594,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","type").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","type").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -614,7 +613,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ipAddress").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ipAddress").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -633,7 +632,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bgpAsn").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bgpAsn").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -644,11 +643,12 @@
                                     
                               }  // End of if for expected property start element
                                 
-                                else{
-                                    // A start element we are not expecting indicates an invalid parameter was passed
-                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
-                                }
-                              
+                                    else {
+                                        
+                                               object.setBgpAsn(java.lang.Integer.MIN_VALUE);
+                                           
+                                    }
+                                  
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();
                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
index 5ffeb59..f98ca97 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateDhcpOptions.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateDhcpOptions",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateDhcpOptions").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateDhcpOptions").equals(reader.getName())){
                                 
                                                 object.setCreateDhcpOptions(com.amazon.ec2.CreateDhcpOptionsType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
index ac7fe08..c15a47e 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateDhcpOptionsResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateDhcpOptionsResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateDhcpOptionsResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateDhcpOptionsResponse").equals(reader.getName())){
                                 
                                                 object.setCreateDhcpOptionsResponse(com.amazon.ec2.CreateDhcpOptionsResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
index d63ca78..282d7d8 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateDhcpOptionsResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateDhcpOptionsResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateDhcpOptionsResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localDhcpOptions==null){
                                                  throw new org.apache.axis2.databinding.ADBException("dhcpOptions cannot be null!!");
                                             }
-                                           localDhcpOptions.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","dhcpOptions"),
+                                           localDhcpOptions.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","dhcpOptions"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "dhcpOptions"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","dhcpOptions").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","dhcpOptions").equals(reader.getName())){
                                 
                                                 object.setDhcpOptions(com.amazon.ec2.DhcpOptionsType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
index 7462820..ad5b13d 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateDhcpOptionsType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateDhcpOptionsType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateDhcpOptionsType",
@@ -177,7 +161,7 @@
                                             if (localDhcpConfigurationSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("dhcpConfigurationSet cannot be null!!");
                                             }
-                                           localDhcpConfigurationSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","dhcpConfigurationSet"),
+                                           localDhcpConfigurationSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","dhcpConfigurationSet"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -342,7 +326,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "dhcpConfigurationSet"));
                             
                             
@@ -429,7 +413,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","dhcpConfigurationSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","dhcpConfigurationSet").equals(reader.getName())){
                                 
                                                 object.setDhcpConfigurationSet(com.amazon.ec2.DhcpConfigurationItemSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateImage.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImage.java b/awsapi/src/com/amazon/ec2/CreateImage.java
index efdbdc2..0c089dd 100644
--- a/awsapi/src/com/amazon/ec2/CreateImage.java
+++ b/awsapi/src/com/amazon/ec2/CreateImage.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateImage.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateImage",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateImage").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateImage").equals(reader.getName())){
                                 
                                                 object.setCreateImage(com.amazon.ec2.CreateImageType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateImageResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImageResponse.java b/awsapi/src/com/amazon/ec2/CreateImageResponse.java
index c90e1e4..19e7a34 100644
--- a/awsapi/src/com/amazon/ec2/CreateImageResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateImageResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateImageResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateImageResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateImageResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateImageResponse").equals(reader.getName())){
                                 
                                                 object.setCreateImageResponse(com.amazon.ec2.CreateImageResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
index dbcaca0..4a816b1 100644
--- a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateImageResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateImageResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateImageResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -434,7 +418,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -443,7 +427,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "imageId"));
                                  
                                         if (localImageId != null){
@@ -530,7 +514,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +533,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","imageId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","imageId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateImageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImageType.java b/awsapi/src/com/amazon/ec2/CreateImageType.java
index 7add5f6..9dc92c5 100644
--- a/awsapi/src/com/amazon/ec2/CreateImageType.java
+++ b/awsapi/src/com/amazon/ec2/CreateImageType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateImageType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateImageType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -196,6 +180,50 @@
                                }
                             
 
+                        /**
+                        * field for BlockDeviceMapping
+                        */
+
+                        
+                                    protected com.amazon.ec2.BlockDeviceMappingType localBlockDeviceMapping ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localBlockDeviceMappingTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.BlockDeviceMappingType
+                           */
+                           public  com.amazon.ec2.BlockDeviceMappingType getBlockDeviceMapping(){
+                               return localBlockDeviceMapping;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param BlockDeviceMapping
+                               */
+                               public void setBlockDeviceMapping(com.amazon.ec2.BlockDeviceMappingType param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localBlockDeviceMappingTracker = true;
+                                       } else {
+                                          localBlockDeviceMappingTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localBlockDeviceMapping=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -279,7 +307,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateImageType",
@@ -293,7 +321,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -327,7 +355,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -361,7 +389,7 @@
                                     
                                    xmlWriter.writeEndElement();
                               if (localDescriptionTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -395,7 +423,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              } if (localNoRebootTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -423,7 +451,13 @@
                                                }
                                     
                                    xmlWriter.writeEndElement();
-                             }
+                             } if (localBlockDeviceMappingTracker){
+                                            if (localBlockDeviceMapping==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("blockDeviceMapping cannot be null!!");
+                                            }
+                                           localBlockDeviceMapping.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","blockDeviceMapping"),
+                                               factory,xmlWriter);
+                                        }
                     xmlWriter.writeEndElement();
                
 
@@ -586,7 +620,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "instanceId"));
                                  
                                         if (localInstanceId != null){
@@ -595,7 +629,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "name"));
                                  
                                         if (localName != null){
@@ -604,7 +638,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("name cannot be null!!");
                                         }
                                      if (localDescriptionTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "description"));
                                  
                                         if (localDescription != null){
@@ -613,12 +647,21 @@
                                            throw new org.apache.axis2.databinding.ADBException("description cannot be null!!");
                                         }
                                     } if (localNoRebootTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "noReboot"));
                                  
                                 elementList.add(
                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNoReboot));
-                            }
+                            } if (localBlockDeviceMappingTracker){
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "blockDeviceMapping"));
+                            
+                            
+                                    if (localBlockDeviceMapping==null){
+                                         throw new org.apache.axis2.databinding.ADBException("blockDeviceMapping cannot be null!!");
+                                    }
+                                    elementList.add(localBlockDeviceMapping);
+                                }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -697,7 +740,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","instanceId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -716,7 +759,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","name").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","name").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -735,7 +778,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","description").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","description").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -753,7 +796,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","noReboot").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","noReboot").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -767,6 +810,21 @@
                                     else {
                                         
                                     }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","blockDeviceMapping").equals(reader.getName())){
+                                
+                                                object.setBlockDeviceMapping(com.amazon.ec2.BlockDeviceMappingType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
                                   
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();


[66/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java b/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
index 2b8308c..6d40776 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVolumeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
index 1370a09..a87a4d2 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVolumeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeType.java b/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
index 3023c18..b42fb7f 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVolumeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpc.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpc.java b/awsapi/src/com/amazon/ec2/DeleteVpc.java
index 8956003..a06972a 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpc.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpc.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpc.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
index f06c09c..4809695 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpcResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
index 6e5413b..02084b8 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpcResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpcType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcType.java b/awsapi/src/com/amazon/ec2/DeleteVpcType.java
index 717c142..7591430 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpcType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpcType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpcType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
index c882979..26f266f 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnConnection.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
index 3d06bc0..41339c5 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnConnectionResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
index 3b9b3ef..0d2719d 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnConnectionResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
index 697f5f1..38da3d2 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnConnectionRoute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
index 1e8c15c..0902129 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnConnectionRouteResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
index 6dbb3e0..3b88185 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnConnectionRouteResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
index cf91b72..1180615 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnConnectionRouteType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
index c074ae2..d14b011 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnConnectionType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java b/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
index 33fe5a9..9917040 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnGateway.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
index e7089b3..a03554c 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnGatewayResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
index d8a32c9..cef8937 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnGatewayResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
index cb01b15..646ef6a 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVpnGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeregisterImage.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImage.java b/awsapi/src/com/amazon/ec2/DeregisterImage.java
index 7703850..365691e 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImage.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImage.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeregisterImage.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java b/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
index 1d4485a..7603735 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeregisterImageResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java b/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
index 0b94889..94c2223 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeregisterImageResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeregisterImageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageType.java b/awsapi/src/com/amazon/ec2/DeregisterImageType.java
index cd1eae9..5e9cebb 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImageType.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImageType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeregisterImageType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAddresses.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddresses.java b/awsapi/src/com/amazon/ec2/DescribeAddresses.java
index 08b8614..7437c5f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddresses.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddresses.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAddresses.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
index 8272ce4..96051d4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAddressesInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
index 66823f7..3d28447 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAddressesItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
index d6ef99c..7506058 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAddressesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
index ca53f8e..e7b4de5 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAddressesResponseInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
index 367fe82..efcb322 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAddressesResponseItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
index a25dfa5..595c00f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAddressesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
index 1c48986..8ca55cb 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAddressesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
index 92f2262..e293353 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAvailabilityZones.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
index 0a315d1..29bfaa2 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAvailabilityZonesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
index f0a1a2a..6d296eb 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAvailabilityZonesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
index 8fac028..97aef75 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAvailabilityZonesSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
index 8b1ac1c..4ba6c1f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAvailabilityZonesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
index ec07779..19f5320 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeAvailabilityZonesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
index df44af9..8fe8ac5 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeBundleTasks.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
index 34f273f..04526b1 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeBundleTasksInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
index c329b4b..2d88fb8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeBundleTasksItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
index 13523ac..634715c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeBundleTasksResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
index cc92e4e..3a1e8ba 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeBundleTasksResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
index 09472bb..9f7c98a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeBundleTasksType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
index e5eb8f2..4be8ecb 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeConversionTasks.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
index f23774d..c765a35 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeConversionTasksResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
index 184f4d4..9918c6d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeConversionTasksResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java
index befa689..0db8880 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeConversionTasksType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java
index 9d5b2ff..c49043f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java
+++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeCustomerGateways.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java
index abaceaa..95a394f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeCustomerGatewaysResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java
index 80c1e3a..a8295f1 100644
--- a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeCustomerGatewaysResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java
index 97f0bde..1c4b961 100644
--- a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeCustomerGatewaysType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java
index f6c1845..8ce1ed4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeDhcpOptions.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java
index 211b7f7..9b8005a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeDhcpOptionsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java
index 21daeaf..de3e014 100644
--- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeDhcpOptionsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java
index 0ef11ff..231a2e6 100644
--- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeDhcpOptionsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeExportTasks.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasks.java b/awsapi/src/com/amazon/ec2/DescribeExportTasks.java
index 5ed890e..2489502 100644
--- a/awsapi/src/com/amazon/ec2/DescribeExportTasks.java
+++ b/awsapi/src/com/amazon/ec2/DescribeExportTasks.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeExportTasks.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java
index fe8045f..3aaacce 100644
--- a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeExportTasksResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java
index 9509caa..d2d0edd 100644
--- a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeExportTasksResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java b/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java
index 04faaf9..a0738ab 100644
--- a/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeExportTasksType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java b/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java
index fbc730d..67f3d9f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImageAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java
index ddb8ece..66a1ceb 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImageAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java
index 4acdab0..9dc16bc 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImageAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java
index fdb8358..5d45e1b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImageAttributeResponseTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java
index 1510340..a496a43 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImageAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java
index 67cf086..598c982 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImageAttributesGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImages.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImages.java b/awsapi/src/com/amazon/ec2/DescribeImages.java
index 78e524e..8fdd54e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImages.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImages.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImages.java


[67/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
index fefa475..69d661e 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeactivateLicenseResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
index 7daff81..5541fd1 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeactivateLicenseResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
index 607558a..0affc72 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeactivateLicenseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
index 0e4fe35..1de518c 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteCustomerGateway.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
index 83c3985..6bbb8b1 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteCustomerGatewayResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
index f8232e1..726c3b1 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteCustomerGatewayResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
index 58f4b05..672321a 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteCustomerGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
index ab1a34b..f5183f1 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteDhcpOptions.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
index 88bd5b7..555b4d3 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteDhcpOptionsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
index 0fb5451..211c184 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteDhcpOptionsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
index bbd1366..e7869ba 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteDhcpOptionsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java b/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
index 480ebbd..a5333ba 100644
--- a/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteInternetGateway.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
index 05a5742..6ca7bfe 100644
--- a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteInternetGatewayResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
index 6ae95d0..c393397 100644
--- a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteInternetGatewayResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
index c7f2674..49ba3ee 100644
--- a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteInternetGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPair.java b/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
index 47cbdb2..f083637 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteKeyPair.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
index 878cdf8..47268e6 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteKeyPairResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
index d30de80..9373a2e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteKeyPairResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
index 3ea154a..5c78b0e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteKeyPairType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
index bd0bd1e..ca49e8b 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkAcl.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
index cff3ebb..10661c7 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkAclEntry.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
index 8058e42..4cefa74 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkAclEntryResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
index 177dd91..c85f6e0 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkAclEntryResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
index 08a2901..705b6e1 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkAclEntryType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
index 160d146..0a189f0 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkAclResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
index 862ae2c..7ff69b4 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkAclResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
index e197c25..b2df99d 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkAclType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
index dd0b7f8..c9a446e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkInterface.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
index d95a97f..e514e6e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkInterfaceResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
index 2f15d3c..9932087 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkInterfaceResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
index adbe557..f56c1b6 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteNetworkInterfaceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
index 5068ae2..bea4267 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeletePlacementGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
index 87faa18..9b934fb 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeletePlacementGroupResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
index 1efb7d2..77e7b2d 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeletePlacementGroupResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
index f795d58..bbfed26 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeletePlacementGroupType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRoute.java b/awsapi/src/com/amazon/ec2/DeleteRoute.java
index 6aa8a05..5727845 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRoute.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRoute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteRoute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java b/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
index 5d87b51..9a12637 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteRouteResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java b/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
index 4f19f0e..5b42f6f 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteRouteResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTable.java b/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
index 6588477..00e0921 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteRouteTable.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
index b6ac3b7..fce6777 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteRouteTableResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
index b4003c2..b2bc5fc 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteRouteTableResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
index 2202b18..65fb2f4 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteRouteTableType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteType.java b/awsapi/src/com/amazon/ec2/DeleteRouteType.java
index 5c3b742..9faf9b6 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteRouteType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
index 94e141b..94bf394 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSecurityGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
index ac65079..cfc2b67 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSecurityGroupResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
index 551ddcd..b4730b8 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSecurityGroupResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
index 0920bfd..f90b380 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSecurityGroupType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshot.java b/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
index 54886e1..774f2cd 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSnapshot.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
index 0a512e1..7afaa1f 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSnapshotResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
index ff156ee..ac79139 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSnapshotResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
index 9929316..75431f3 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSnapshotType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
index 5f2b63e..a2376dd 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSpotDatafeedSubscription.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
index cfedcdf..1714297 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSpotDatafeedSubscriptionResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
index 658999e..1664a21 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSpotDatafeedSubscriptionResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
index 2ccf436..2e8a07d 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSpotDatafeedSubscriptionType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSubnet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnet.java b/awsapi/src/com/amazon/ec2/DeleteSubnet.java
index 87be24d..9e3906b 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnet.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnet.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSubnet.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java b/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
index 775bb4b..6b669e9 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSubnetResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
index f2317b4..332fea8 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSubnetResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetType.java b/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
index 3e23394..e59ee4f 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteSubnetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteTags.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTags.java b/awsapi/src/com/amazon/ec2/DeleteTags.java
index 4f4bd96..79dec6b 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTags.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTags.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteTags.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java b/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
index 83f28bf..342eb4d 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteTagsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java b/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
index 583e985..44be615 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteTagsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java b/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
index af609d2..8a56691 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteTagsSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java b/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
index 8e4a265..97cf635 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteTagsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteTagsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsType.java b/awsapi/src/com/amazon/ec2/DeleteTagsType.java
index 682ecee..632019a 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteTagsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeleteVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolume.java b/awsapi/src/com/amazon/ec2/DeleteVolume.java
index 591ef92..00166a3 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolume.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolume.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeleteVolume.java


[06/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
index a0f3ca3..0920bfd 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSecurityGroupType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,19 +17,76 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteSecurityGroupType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
         }
 
         
+            /** Whenever a new property is set ensure all others are unset
+             *  There can be only one choice and the last one wins
+             */
+            private void clearAllSettingTrackers() {
+            
+                   localGroupIdTracker = false;
+                
+                   localGroupNameTracker = false;
+                
+            }
+        
+
+                        /**
+                        * field for GroupId
+                        */
+
+                        
+                                    protected java.lang.String localGroupId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localGroupIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getGroupId(){
+                               return localGroupId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param GroupId
+                               */
+                               public void setGroupId(java.lang.String param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localGroupIdTracker = true;
+                                       } else {
+                                          localGroupIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localGroupId=param;
+                                    
+
+                               }
+                            
 
                         /**
                         * field for GroupName
@@ -54,6 +95,12 @@
                         
                                     protected java.lang.String localGroupName ;
                                 
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localGroupNameTracker = false ;
+                           
 
                            /**
                            * Auto generated getter method
@@ -71,6 +118,16 @@
                                */
                                public void setGroupName(java.lang.String param){
                             
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localGroupNameTracker = true;
+                                       } else {
+                                          localGroupNameTracker = false;
+                                              
+                                       }
+                                   
                                             this.localGroupName=param;
                                     
 
@@ -160,7 +217,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteSecurityGroupType",
@@ -173,8 +230,42 @@
 
                
                    }
-               
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                if (localGroupIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"groupId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"groupId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("groupId");
+                                    }
+                                
+
+                                          if (localGroupId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("groupId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localGroupId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localGroupNameTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -207,7 +298,7 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             
+                             }
                     xmlWriter.writeEndElement();
                
 
@@ -369,8 +460,17 @@
                  java.util.ArrayList elementList = new java.util.ArrayList();
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
-                
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                 if (localGroupIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "groupId"));
+                                 
+                                        if (localGroupId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localGroupId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("groupId cannot be null!!");
+                                        }
+                                    } if (localGroupNameTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "groupName"));
                                  
                                         if (localGroupName != null){
@@ -378,7 +478,7 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("groupName cannot be null!!");
                                         }
-                                    
+                                    }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -453,11 +553,24 @@
                  
                     
                     reader.next();
+                   
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
                 
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setGroupId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
                                     
-                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                              }  // End of if for expected property start element
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","groupName").equals(reader.getName())){
+                                        else
+                                    
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -468,18 +581,11 @@
                                     
                               }  // End of if for expected property start element
                                 
-                                else{
-                                    // A start element we are not expecting indicates an invalid parameter was passed
-                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
-                                }
-                              
-                            while (!reader.isStartElement() && !reader.isEndElement())
+                             } else {
                                 reader.next();
-                            
-                                if (reader.isStartElement())
-                                // A start element we are not expecting indicates a trailing invalid property
-                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
-                            
+                             }  
+                           }  // end of while loop
+                        
 
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshot.java b/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
index 0d95f1f..54886e1 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSnapshot.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteSnapshot",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteSnapshot").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteSnapshot").equals(reader.getName())){
                                 
                                                 object.setDeleteSnapshot(com.amazon.ec2.DeleteSnapshotType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
index 801fe84..0a512e1 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSnapshotResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteSnapshotResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteSnapshotResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteSnapshotResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteSnapshotResponse(com.amazon.ec2.DeleteSnapshotResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
index 1292ea3..ff156ee 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSnapshotResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteSnapshotResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteSnapshotResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
index 7489573..9929316 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSnapshotType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteSnapshotType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteSnapshotType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "snapshotId"));
                                  
                                         if (localSnapshotId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","snapshotId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","snapshotId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
index 3a0e218..5f2b63e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSpotDatafeedSubscription.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteSpotDatafeedSubscription",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteSpotDatafeedSubscription").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteSpotDatafeedSubscription").equals(reader.getName())){
                                 
                                                 object.setDeleteSpotDatafeedSubscription(com.amazon.ec2.DeleteSpotDatafeedSubscriptionType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
index fb6bdd2..cfedcdf 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSpotDatafeedSubscriptionResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteSpotDatafeedSubscriptionResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteSpotDatafeedSubscriptionResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteSpotDatafeedSubscriptionResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteSpotDatafeedSubscriptionResponse(com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
index d5fbea1..658999e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSpotDatafeedSubscriptionResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteSpotDatafeedSubscriptionResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteSpotDatafeedSubscriptionResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
index 9938169..2ccf436 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSpotDatafeedSubscriptionType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteSpotDatafeedSubscriptionType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -130,7 +114,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteSpotDatafeedSubscriptionType",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSubnet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnet.java b/awsapi/src/com/amazon/ec2/DeleteSubnet.java
index 7055f1a..87be24d 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnet.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnet.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSubnet.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteSubnet",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteSubnet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteSubnet").equals(reader.getName())){
                                 
                                                 object.setDeleteSubnet(com.amazon.ec2.DeleteSubnetType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java b/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
index 6cabcac..775bb4b 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSubnetResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteSubnetResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteSubnetResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteSubnetResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteSubnetResponse(com.amazon.ec2.DeleteSubnetResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
index 5d6bc3e..f2317b4 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSubnetResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteSubnetResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteSubnetResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetType.java b/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
index 2d67792..3e23394 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSubnetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteSubnetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteSubnetType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "subnetId"));
                                  
                                         if (localSubnetId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","subnetId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","subnetId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteTags.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTags.java b/awsapi/src/com/amazon/ec2/DeleteTags.java
index b16bb67..4f4bd96 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTags.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTags.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteTags.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteTags",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteTags").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteTags").equals(reader.getName())){
                                 
                                                 object.setDeleteTags(com.amazon.ec2.DeleteTagsType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java b/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
index f9ac42e..83f28bf 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteTagsResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteTagsResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteTagsResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteTagsResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteTagsResponse(com.amazon.ec2.DeleteTagsResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java b/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
index 99a8ac4..583e985 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteTagsResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteTagsResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteTagsResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java b/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
index 2e59fb7..af609d2 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteTagsSetItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteTagsSetItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -218,7 +202,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteTagsSetItemType",
@@ -232,7 +216,7 @@
                
                    }
                 if (localKeyTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -266,7 +250,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              } if (localValueTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -462,7 +446,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                  if (localKeyTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "key"));
                                  
                                         if (localKey != null){
@@ -471,7 +455,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("key cannot be null!!");
                                         }
                                     } if (localValueTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "value"));
                                  
                                         if (localValue != null){
@@ -558,7 +542,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","key").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","key").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -576,7 +560,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","value").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","value").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     


[42/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressType.java b/awsapi/src/com/amazon/ec2/AssociateAddressType.java
index 973776d..388d8f1 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AssociateAddressType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AssociateAddressType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -48,60 +32,149 @@
         
 
                         /**
-                        * field for PublicIp
+                        * field for AssociateAddressTypeChoice_type0
                         */
 
                         
-                                    protected java.lang.String localPublicIp ;
+                                    protected com.amazon.ec2.AssociateAddressTypeChoice_type0 localAssociateAddressTypeChoice_type0 ;
                                 
 
                            /**
                            * Auto generated getter method
-                           * @return java.lang.String
+                           * @return com.amazon.ec2.AssociateAddressTypeChoice_type0
                            */
-                           public  java.lang.String getPublicIp(){
-                               return localPublicIp;
+                           public  com.amazon.ec2.AssociateAddressTypeChoice_type0 getAssociateAddressTypeChoice_type0(){
+                               return localAssociateAddressTypeChoice_type0;
                            }
 
                            
                         
                             /**
                                * Auto generated setter method
-                               * @param param PublicIp
+                               * @param param AssociateAddressTypeChoice_type0
                                */
-                               public void setPublicIp(java.lang.String param){
+                               public void setAssociateAddressTypeChoice_type0(com.amazon.ec2.AssociateAddressTypeChoice_type0 param){
                             
-                                            this.localPublicIp=param;
+                                            this.localAssociateAddressTypeChoice_type0=param;
                                     
 
                                }
                             
 
                         /**
-                        * field for InstanceId
+                        * field for AssociateAddressTypeChoice_type1
                         */
 
                         
-                                    protected java.lang.String localInstanceId ;
+                                    protected com.amazon.ec2.AssociateAddressTypeChoice_type1 localAssociateAddressTypeChoice_type1 ;
                                 
 
                            /**
                            * Auto generated getter method
+                           * @return com.amazon.ec2.AssociateAddressTypeChoice_type1
+                           */
+                           public  com.amazon.ec2.AssociateAddressTypeChoice_type1 getAssociateAddressTypeChoice_type1(){
+                               return localAssociateAddressTypeChoice_type1;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AssociateAddressTypeChoice_type1
+                               */
+                               public void setAssociateAddressTypeChoice_type1(com.amazon.ec2.AssociateAddressTypeChoice_type1 param){
+                            
+                                            this.localAssociateAddressTypeChoice_type1=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for PrivateIpAddress
+                        */
+
+                        
+                                    protected java.lang.String localPrivateIpAddress ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localPrivateIpAddressTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
                            * @return java.lang.String
                            */
-                           public  java.lang.String getInstanceId(){
-                               return localInstanceId;
+                           public  java.lang.String getPrivateIpAddress(){
+                               return localPrivateIpAddress;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param PrivateIpAddress
+                               */
+                               public void setPrivateIpAddress(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localPrivateIpAddressTracker = true;
+                                       } else {
+                                          localPrivateIpAddressTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localPrivateIpAddress=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for AllowReassociation
+                        */
+
+                        
+                                    protected boolean localAllowReassociation ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localAllowReassociationTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean getAllowReassociation(){
+                               return localAllowReassociation;
                            }
 
                            
                         
                             /**
                                * Auto generated setter method
-                               * @param param InstanceId
+                               * @param param AllowReassociation
                                */
-                               public void setInstanceId(java.lang.String param){
+                               public void setAllowReassociation(boolean param){
                             
-                                            this.localInstanceId=param;
+                                       // setting primitive attribute tracker to true
+                                       
+                                               if (false) {
+                                           localAllowReassociationTracker = false;
+                                              
+                                       } else {
+                                          localAllowReassociationTracker = true;
+                                       }
+                                   
+                                            this.localAllowReassociation=param;
                                     
 
                                }
@@ -190,7 +263,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AssociateAddressType",
@@ -204,74 +277,79 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                            if (localAssociateAddressTypeChoice_type0==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("AssociateAddressTypeChoice_type0 cannot be null!!");
+                                            }
+                                           localAssociateAddressTypeChoice_type0.serialize(null,factory,xmlWriter);
+                                        
+                                            if (localAssociateAddressTypeChoice_type1==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("AssociateAddressTypeChoice_type1 cannot be null!!");
+                                            }
+                                           localAssociateAddressTypeChoice_type1.serialize(null,factory,xmlWriter);
+                                         if (localPrivateIpAddressTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
                                         if (prefix == null) {
                                             prefix = generatePrefix(namespace);
 
-                                            xmlWriter.writeStartElement(prefix,"publicIp", namespace);
+                                            xmlWriter.writeStartElement(prefix,"privateIpAddress", namespace);
                                             xmlWriter.writeNamespace(prefix, namespace);
                                             xmlWriter.setPrefix(prefix, namespace);
 
                                         } else {
-                                            xmlWriter.writeStartElement(namespace,"publicIp");
+                                            xmlWriter.writeStartElement(namespace,"privateIpAddress");
                                         }
 
                                     } else {
-                                        xmlWriter.writeStartElement("publicIp");
+                                        xmlWriter.writeStartElement("privateIpAddress");
                                     }
                                 
 
-                                          if (localPublicIp==null){
+                                          if (localPrivateIpAddress==null){
                                               // write the nil attribute
                                               
-                                                     throw new org.apache.axis2.databinding.ADBException("publicIp cannot be null!!");
+                                                     throw new org.apache.axis2.databinding.ADBException("privateIpAddress cannot be null!!");
                                                   
                                           }else{
 
                                         
-                                                   xmlWriter.writeCharacters(localPublicIp);
+                                                   xmlWriter.writeCharacters(localPrivateIpAddress);
                                             
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                             } if (localAllowReassociationTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
                                         if (prefix == null) {
                                             prefix = generatePrefix(namespace);
 
-                                            xmlWriter.writeStartElement(prefix,"instanceId", namespace);
+                                            xmlWriter.writeStartElement(prefix,"allowReassociation", namespace);
                                             xmlWriter.writeNamespace(prefix, namespace);
                                             xmlWriter.setPrefix(prefix, namespace);
 
                                         } else {
-                                            xmlWriter.writeStartElement(namespace,"instanceId");
+                                            xmlWriter.writeStartElement(namespace,"allowReassociation");
                                         }
 
                                     } else {
-                                        xmlWriter.writeStartElement("instanceId");
+                                        xmlWriter.writeStartElement("allowReassociation");
                                     }
                                 
-
-                                          if (localInstanceId==null){
-                                              // write the nil attribute
-                                              
-                                                     throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
-                                                  
-                                          }else{
-
-                                        
-                                                   xmlWriter.writeCharacters(localInstanceId);
-                                            
-                                          }
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("allowReassociation cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAllowReassociation));
+                                               }
                                     
                                    xmlWriter.writeEndElement();
-                             
+                             }
                     xmlWriter.writeEndElement();
                
 
@@ -434,24 +512,39 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
-                                                                      "publicIp"));
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "AssociateAddressTypeChoice_type0"));
+                            
+                            
+                                    if (localAssociateAddressTypeChoice_type0==null){
+                                         throw new org.apache.axis2.databinding.ADBException("AssociateAddressTypeChoice_type0 cannot be null!!");
+                                    }
+                                    elementList.add(localAssociateAddressTypeChoice_type0);
+                                
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "AssociateAddressTypeChoice_type1"));
+                            
+                            
+                                    if (localAssociateAddressTypeChoice_type1==null){
+                                         throw new org.apache.axis2.databinding.ADBException("AssociateAddressTypeChoice_type1 cannot be null!!");
+                                    }
+                                    elementList.add(localAssociateAddressTypeChoice_type1);
+                                 if (localPrivateIpAddressTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "privateIpAddress"));
                                  
-                                        if (localPublicIp != null){
-                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPublicIp));
+                                        if (localPrivateIpAddress != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPrivateIpAddress));
                                         } else {
-                                           throw new org.apache.axis2.databinding.ADBException("publicIp cannot be null!!");
+                                           throw new org.apache.axis2.databinding.ADBException("privateIpAddress cannot be null!!");
                                         }
-                                    
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
-                                                                      "instanceId"));
+                                    } if (localAllowReassociationTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "allowReassociation"));
                                  
-                                        if (localInstanceId != null){
-                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localInstanceId));
-                                        } else {
-                                           throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
-                                        }
-                                    
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAllowReassociation));
+                            }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -530,41 +623,57 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","publicIp").equals(reader.getName())){
+                                    if (reader.isStartElement() ){
+                                
+                                                object.setAssociateAddressTypeChoice_type0(com.amazon.ec2.AssociateAddressTypeChoice_type0.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() ){
+                                
+                                                object.setAssociateAddressTypeChoice_type1(com.amazon.ec2.AssociateAddressTypeChoice_type1.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","privateIpAddress").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
-                                              object.setPublicIp(
+                                              object.setPrivateIpAddress(
                                                     org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
                                               
                                         reader.next();
                                     
                               }  // End of if for expected property start element
                                 
-                                else{
-                                    // A start element we are not expecting indicates an invalid parameter was passed
-                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
-                                }
-                            
+                                    else {
+                                        
+                                    }
+                                
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","instanceId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","allowReassociation").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
-                                              object.setInstanceId(
-                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              object.setAllowReassociation(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
                                               
                                         reader.next();
                                     
                               }  // End of if for expected property start element
                                 
-                                else{
-                                    // A start element we are not expecting indicates an invalid parameter was passed
-                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
-                                }
-                              
+                                    else {
+                                        
+                                    }
+                                  
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();
                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
new file mode 100644
index 0000000..c9627b4
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
@@ -0,0 +1,545 @@
+
+/**
+ * AssociateAddressTypeChoice_type0.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssociateAddressTypeChoice_type0 bean class
+            */
+        
+        public  class AssociateAddressTypeChoice_type0
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AssociateAddressTypeChoice_type0
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+            /** Whenever a new property is set ensure all others are unset
+             *  There can be only one choice and the last one wins
+             */
+            private void clearAllSettingTrackers() {
+            
+                   localPublicIpTracker = false;
+                
+                   localAllocationIdTracker = false;
+                
+            }
+        
+
+                        /**
+                        * field for PublicIp
+                        */
+
+                        
+                                    protected java.lang.String localPublicIp ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localPublicIpTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getPublicIp(){
+                               return localPublicIp;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param PublicIp
+                               */
+                               public void setPublicIp(java.lang.String param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localPublicIpTracker = true;
+                                       } else {
+                                          localPublicIpTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localPublicIp=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for AllocationId
+                        */
+
+                        
+                                    protected java.lang.String localAllocationId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localAllocationIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getAllocationId(){
+                               return localAllocationId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AllocationId
+                               */
+                               public void setAllocationId(java.lang.String param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localAllocationIdTracker = true;
+                                       } else {
+                                          localAllocationIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localAllocationId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssociateAddressTypeChoice_type0.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AssociateAddressTypeChoice_type0",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AssociateAddressTypeChoice_type0",
+                           xmlWriter);
+                   }
+
+               
+                   }
+                if (localPublicIpTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"publicIp", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"publicIp");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("publicIp");
+                                    }
+                                
+
+                                          if (localPublicIp==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("publicIp cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localPublicIp);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localAllocationIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"allocationId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"allocationId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("allocationId");
+                                    }
+                                
+
+                                          if (localAllocationId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("allocationId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localAllocationId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                 if (localPublicIpTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "publicIp"));
+                                 
+                                        if (localPublicIp != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPublicIp));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("publicIp cannot be null!!");
+                                        }
+                                    } if (localAllocationIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "allocationId"));
+                                 
+                                        if (localAllocationId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAllocationId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("allocationId cannot be null!!");
+                                        }
+                                    }
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssociateAddressTypeChoice_type0 parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssociateAddressTypeChoice_type0 object =
+                new AssociateAddressTypeChoice_type0();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","publicIp").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setPublicIp(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                        else
+                                    
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","allocationId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setAllocationId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
new file mode 100644
index 0000000..4f0a7cd
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
@@ -0,0 +1,545 @@
+
+/**
+ * AssociateAddressTypeChoice_type1.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssociateAddressTypeChoice_type1 bean class
+            */
+        
+        public  class AssociateAddressTypeChoice_type1
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AssociateAddressTypeChoice_type1
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+            /** Whenever a new property is set ensure all others are unset
+             *  There can be only one choice and the last one wins
+             */
+            private void clearAllSettingTrackers() {
+            
+                   localNetworkInterfaceIdTracker = false;
+                
+                   localInstanceIdTracker = false;
+                
+            }
+        
+
+                        /**
+                        * field for NetworkInterfaceId
+                        */
+
+                        
+                                    protected java.lang.String localNetworkInterfaceId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localNetworkInterfaceIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getNetworkInterfaceId(){
+                               return localNetworkInterfaceId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkInterfaceId
+                               */
+                               public void setNetworkInterfaceId(java.lang.String param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localNetworkInterfaceIdTracker = true;
+                                       } else {
+                                          localNetworkInterfaceIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localNetworkInterfaceId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for InstanceId
+                        */
+
+                        
+                                    protected java.lang.String localInstanceId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localInstanceIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getInstanceId(){
+                               return localInstanceId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param InstanceId
+                               */
+                               public void setInstanceId(java.lang.String param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localInstanceIdTracker = true;
+                                       } else {
+                                          localInstanceIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localInstanceId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssociateAddressTypeChoice_type1.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AssociateAddressTypeChoice_type1",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AssociateAddressTypeChoice_type1",
+                           xmlWriter);
+                   }
+
+               
+                   }
+                if (localNetworkInterfaceIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"networkInterfaceId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"networkInterfaceId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("networkInterfaceId");
+                                    }
+                                
+
+                                          if (localNetworkInterfaceId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localNetworkInterfaceId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localInstanceIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"instanceId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"instanceId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("instanceId");
+                                    }
+                                
+
+                                          if (localInstanceId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localInstanceId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                 if (localNetworkInterfaceIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkInterfaceId"));
+                                 
+                                        if (localNetworkInterfaceId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNetworkInterfaceId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                        }
+                                    } if (localInstanceIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "instanceId"));
+                                 
+                                        if (localInstanceId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localInstanceId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
+                                        }
+                                    }
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssociateAddressTypeChoice_type1 parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssociateAddressTypeChoice_type1 object =
+                new AssociateAddressTypeChoice_type1();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkInterfaceId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setNetworkInterfaceId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                        else
+                                    
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setInstanceId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
index 117aa2e..e6a0794 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AssociateDhcpOptions.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AssociateDhcpOptions",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AssociateDhcpOptions").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AssociateDhcpOptions").equals(reader.getName())){
                                 
                                                 object.setAssociateDhcpOptions(com.amazon.ec2.AssociateDhcpOptionsType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
index 7bdb35c..0f5357b 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AssociateDhcpOptionsResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AssociateDhcpOptionsResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AssociateDhcpOptionsResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AssociateDhcpOptionsResponse").equals(reader.getName())){
                                 
                                                 object.setAssociateDhcpOptionsResponse(com.amazon.ec2.AssociateDhcpOptionsResponseType.Factory.parse(reader));
                                             


[65/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java
index 6ded564..6c21c0f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesExecutableBySetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java
index 1403d35..88f3415 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesExecutableByType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java b/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java
index 1dcc9e1..80f9b46 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java b/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java
index cd30d3e..a6574ac 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java b/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java
index 1e52ade..6707040 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesOwnerType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java b/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java
index 1e70b32..a3afbb4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesOwnersType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java
index 3296214..50af760 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java
index c9dad27..6cfa915 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesResponseInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java
index 2529572..5baca26 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesResponseItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java
index df1b6cc..57c5951 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeImagesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesType.java b/awsapi/src/com/amazon/ec2/DescribeImagesType.java
index a357ad6..9703e61 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeImagesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java
index a23f080..ea91ce3 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstanceAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java
index 91a615f..fb03734 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstanceAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java
index 4251ed3..75e197c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstanceAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java
index 36a8404..a1ec7a8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstanceAttributeResponseTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java
index cbc4ba2..d483d4b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstanceAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java
index 5a7d157..35896c0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstanceAttributesGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java
index 0937673..4efd90a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstanceStatus.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java
index 1dfec2b..43080f8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstanceStatusResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java
index be8f260..4dd11fc 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstanceStatusResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java
index cb149ed..c8643c8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstanceStatusType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstances.java b/awsapi/src/com/amazon/ec2/DescribeInstances.java
index 7e4b635..504e67c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstances.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstances.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstances.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java
index 20d8d0d..22ec3d6 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstancesInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java
index 049efc5..9e3ef32 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstancesItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java b/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java
index fdcb18b..bb26da8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstancesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java
index f20b86f..45ae95c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstancesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesType.java
index c40a60f..abc3434 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstancesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInstancesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java b/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java
index 9302785..5abbc87 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInternetGateways.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java
index 7f3bc29..ef4da73 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInternetGatewaysResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java
index dce0419..a631470 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInternetGatewaysResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java
index 5d29775..c9f16cf 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeInternetGatewaysType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java
index 32f8f8b..6b3e369 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeKeyPairs.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java
index c2059da..e9ff739 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeKeyPairsInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java
index 5085716..516e49c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeKeyPairsItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java
index 5892443..087d54d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeKeyPairsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java
index f56632f..91f0b62 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeKeyPairsResponseInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java
index da1d642..43579b4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeKeyPairsResponseItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java
index fd58996..ccb233e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeKeyPairsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java
index 349e9d2..cf3a286 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeKeyPairsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeLicenses.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeLicenses.java b/awsapi/src/com/amazon/ec2/DescribeLicenses.java
index ca4928e..84fa595 100644
--- a/awsapi/src/com/amazon/ec2/DescribeLicenses.java
+++ b/awsapi/src/com/amazon/ec2/DescribeLicenses.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeLicenses.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java b/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java
index 105455b..32587ea 100644
--- a/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeLicensesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java
index 74acbc3..6634b77 100644
--- a/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeLicensesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeLicensesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeLicensesType.java b/awsapi/src/com/amazon/ec2/DescribeLicensesType.java
index d995995..5edf990 100644
--- a/awsapi/src/com/amazon/ec2/DescribeLicensesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeLicensesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeLicensesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java
index b12c37f..0c562f9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkAcls.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java
index ecf8d54..fec108b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkAclsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java
index 512995b..f733b61 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkAclsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java
index b535278..aa80bcb 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkAclsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java
index 97bfdad..62397f1 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkInterfaceAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java
index 571a571..4cc6017 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkInterfaceAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java
index 92cdbcc..e7f236f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkInterfaceAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java
index 1ae2157..f25a9d2 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java
index 49e38df..b54b8c5 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkInterfaceAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java
index 2f16bf8..5b340d8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkInterfaceAttributesGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java
index bde2545..8a6dad9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkInterfaces.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java
index eb433d2..6f73ae0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkInterfacesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java
index abd9cb4..f69d37c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkInterfacesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java
index c4d9b34..c975833 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeNetworkInterfacesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java
index 4909a92..b1629c5 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribePlacementGroupItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java
index 427a969..74b18e0 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribePlacementGroups.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java
index e88e402..9631664 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribePlacementGroupsInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java
index 58aa237..334db9c 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribePlacementGroupsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java
index d682dbc..42cfdd0 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribePlacementGroupsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java
index 170a5da..ebe9c1f 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribePlacementGroupsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeRegions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegions.java b/awsapi/src/com/amazon/ec2/DescribeRegions.java
index b937aee..fff0af1 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegions.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegions.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeRegions.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java b/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java
index a460f84..d92003a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeRegionsResponse.java


[53/71] [abbrv] git commit: updated refs/heads/master to 26af71b

Posted by li...@apache.org.
CLOUDSTACK-1444. Updated EC2SoapService and EC2SoapServiceImpl to be compatible with the java stubs generated from EC2 WSDL 2012-08-15.
  - by adding stubs for the new EC2 APIs (unsupported by CS AWSAPI)
  - by setting the new EC2 API response elements
  - by adding support for the new EC2 API request elements
[Support for EC2 API version 2012-08-15]


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/135b688a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/135b688a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/135b688a

Branch: refs/heads/master
Commit: 135b688a00bdf69b0a02345385ba7dd7d99188c3
Parents: 2570b66
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Jul 4 10:06:51 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Jul 4 10:06:51 2013 +0530

----------------------------------------------------------------------
 .../cloud/bridge/service/EC2RestServlet.java    |   8 +-
 .../cloud/bridge/service/EC2SoapService.java    | 344 +++++++++++++++++-
 .../bridge/service/EC2SoapServiceImpl.java      | 362 ++++++++++++++++++-
 .../bridge/service/core/ec2/EC2Engine.java      | 239 ++++++------
 .../service/core/ec2/EC2RunInstances.java       |  24 +-
 5 files changed, 839 insertions(+), 138 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/135b688a/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 faa293b..e75713f 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
@@ -1255,8 +1255,12 @@ public class EC2RestServlet extends HttpServlet {
             String key = (String)names.nextElement();
             if ( key.startsWith("SecurityGroup")) {
                 String[] value = request.getParameterValues(key);
-                if (null != value && 0 < value.length)
-                    EC2request.addGroupName( value[0]);
+                if (null != value && 0 < value.length) {
+                    if ( key.startsWith("SecurityGroupId"))
+                        EC2request.addSecuritGroupId( value[0]);
+                    else
+                        EC2request.addSecuritGroupName( value[0]);
+                }
             }
         }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/135b688a/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 1f7f612..0202c33 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
@@ -568,4 +568,346 @@ public class EC2SoapService implements AmazonEC2SkeletonInterface {
 			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
 			return ec2Service.importVolume(importVolume);
 		}
-}
+		
+
+		@Override
+		public ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute(
+				ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.resetNetworkInterfaceAttribute(resetNetworkInterfaceAttribute);
+		}
+
+		@Override
+		public CreateRouteTableResponse createRouteTable(
+				CreateRouteTable createRouteTable) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.createRouteTable(createRouteTable);
+		}
+
+		@Override
+		public CreateNetworkAclEntryResponse createNetworkAclEntry(
+				CreateNetworkAclEntry createNetworkAclEntry) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.createNetworkAclEntry(createNetworkAclEntry);
+		}
+
+		@Override
+		public DescribeVolumeAttributeResponse describeVolumeAttribute(
+				DescribeVolumeAttribute describeVolumeAttribute) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.describeVolumeAttribute(describeVolumeAttribute);
+		}
+
+		@Override
+		public DeleteNetworkInterfaceResponse deleteNetworkInterface(
+				DeleteNetworkInterface deleteNetworkInterface) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.deleteNetworkInterface(deleteNetworkInterface);
+		}
+
+		@Override
+		public CreateInternetGatewayResponse createInternetGateway(
+				CreateInternetGateway createInternetGateway) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.createInternetGateway(createInternetGateway);
+		}
+
+		@Override
+		public DisassociateRouteTableResponse disassociateRouteTable(
+				DisassociateRouteTable disassociateRouteTable) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.disassociateRouteTable(disassociateRouteTable);
+		}
+
+		@Override
+		public ReplaceNetworkAclEntryResponse replaceNetworkAclEntry(
+				ReplaceNetworkAclEntry replaceNetworkAclEntry) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.replaceNetworkAclEntry(replaceNetworkAclEntry);
+		}
+
+		@Override
+		public AuthorizeSecurityGroupEgressResponse authorizeSecurityGroupEgress(
+				AuthorizeSecurityGroupEgress authorizeSecurityGroupEgress) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.authorizeSecurityGroupEgress(authorizeSecurityGroupEgress);
+		}
+
+		@Override
+		public DeleteNetworkAclEntryResponse deleteNetworkAclEntry(
+				DeleteNetworkAclEntry deleteNetworkAclEntry) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.deleteNetworkAclEntry(deleteNetworkAclEntry);
+		}
+
+		@Override
+		public DeleteRouteTableResponse deleteRouteTable(
+				DeleteRouteTable deleteRouteTable) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.deleteRouteTable(deleteRouteTable);
+		}
+
+		@Override
+		public DescribeNetworkInterfaceAttributeResponse describeNetworkInterfaceAttribute(
+				DescribeNetworkInterfaceAttribute describeNetworkInterfaceAttribute) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.describeNetworkInterfaceAttribute(describeNetworkInterfaceAttribute);
+		}
+
+		@Override
+		public CreateReservedInstancesListingResponse createReservedInstancesListing(
+				CreateReservedInstancesListing createReservedInstancesListing) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.createReservedInstancesListing(createReservedInstancesListing);
+		}
+
+		@Override
+		public CreateNetworkAclResponse createNetworkAcl(
+				CreateNetworkAcl createNetworkAcl) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.createNetworkAcl(createNetworkAcl);
+		}
+
+		@Override
+		public ModifyVolumeAttributeResponse modifyVolumeAttribute(
+				ModifyVolumeAttribute modifyVolumeAttribute) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.modifyVolumeAttribute(modifyVolumeAttribute);
+		}
+
+		@Override
+		public ReplaceNetworkAclAssociationResponse replaceNetworkAclAssociation(
+				ReplaceNetworkAclAssociation replaceNetworkAclAssociation) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.replaceNetworkAclAssociation(replaceNetworkAclAssociation);
+		}
+
+		@Override
+		public EnableVgwRoutePropagationResponse enableVgwRoutePropagation(
+				EnableVgwRoutePropagation enableVgwRoutePropagation) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.enableVgwRoutePropagation(enableVgwRoutePropagation);
+		}
+
+		@Override
+		public UnassignPrivateIpAddressesResponse unassignPrivateIpAddresses(
+				UnassignPrivateIpAddresses unassignPrivateIpAddresses) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.unassignPrivateIpAddresses(unassignPrivateIpAddresses);
+		}
+
+		@Override
+		public DeleteVpnConnectionRouteResponse deleteVpnConnectionRoute(
+				DeleteVpnConnectionRoute deleteVpnConnectionRoute) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.deleteVpnConnectionRoute(deleteVpnConnectionRoute);
+		}
+
+		@Override
+		public CancelReservedInstancesListingResponse cancelReservedInstancesListing(
+				CancelReservedInstancesListing cancelReservedInstancesListing) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.cancelReservedInstancesListing(cancelReservedInstancesListing);
+		}
+
+		@Override
+		public DescribeNetworkAclsResponse describeNetworkAcls(
+				DescribeNetworkAcls describeNetworkAcls) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.describeNetworkAcls(describeNetworkAcls);
+		}
+
+		@Override
+		public EnableVolumeIOResponse enableVolumeIO(
+				EnableVolumeIO enableVolumeIO) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.enableVolumeIO(enableVolumeIO);
+		}
+
+		@Override
+		public DescribeInternetGatewaysResponse describeInternetGateways(
+				DescribeInternetGateways describeInternetGateways) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.describeInternetGateways(describeInternetGateways);
+		}
+
+		@Override
+		public DescribeReservedInstancesListingsResponse describeReservedInstancesListings(
+				DescribeReservedInstancesListings describeReservedInstancesListings) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.describeReservedInstancesListings(describeReservedInstancesListings);
+		}
+
+		@Override
+		public DescribeInstanceStatusResponse describeInstanceStatus(
+				DescribeInstanceStatus describeInstanceStatus) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.describeInstanceStatus(describeInstanceStatus);
+		}
+
+		@Override
+		public ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute(
+				ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.modifyNetworkInterfaceAttribute(modifyNetworkInterfaceAttribute);
+		}
+
+		@Override
+		public DisableVgwRoutePropagationResponse disableVgwRoutePropagation(
+				DisableVgwRoutePropagation disableVgwRoutePropagation) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.disableVgwRoutePropagation(disableVgwRoutePropagation);
+		}
+
+		@Override
+		public DescribeVolumeStatusResponse describeVolumeStatus(
+				DescribeVolumeStatus describeVolumeStatus) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.describeVolumeStatus(describeVolumeStatus);
+		}
+
+		@Override
+		public DetachNetworkInterfaceResponse detachNetworkInterface(
+				DetachNetworkInterface detachNetworkInterface) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.detachNetworkInterface(detachNetworkInterface);
+		}
+
+		@Override
+		public DescribeNetworkInterfacesResponse describeNetworkInterfaces(
+				DescribeNetworkInterfaces describeNetworkInterfaces) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.describeNetworkInterfaces(describeNetworkInterfaces);
+		}
+
+		@Override
+		public CancelExportTaskResponse cancelExportTask(
+				CancelExportTask cancelExportTask) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.cancelExportTask(cancelExportTask);
+		}
+
+		@Override
+		public CreateRouteResponse createRoute(CreateRoute createRoute) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.createRoute(createRoute);
+		}
+
+		@Override
+		public DescribeRouteTablesResponse describeRouteTables(
+				DescribeRouteTables describeRouteTables) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.describeRouteTables(describeRouteTables);
+		}
+
+		@Override
+		public DeleteNetworkAclResponse deleteNetworkAcl(
+				DeleteNetworkAcl deleteNetworkAcl) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.deleteNetworkAcl(deleteNetworkAcl);
+		}
+
+		@Override
+		public DeleteRouteResponse deleteRoute(DeleteRoute deleteRoute) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.deleteRoute(deleteRoute);
+		}
+
+		@Override
+		public CreateVpnConnectionRouteResponse createVpnConnectionRoute(
+				CreateVpnConnectionRoute createVpnConnectionRoute) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.createVpnConnectionRoute(createVpnConnectionRoute);
+		}
+
+		@Override
+		public AttachInternetGatewayResponse attachInternetGateway(
+				AttachInternetGateway attachInternetGateway) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.attachInternetGateway(attachInternetGateway);
+		}
+
+		@Override
+		public ReplaceRouteTableAssociationResponse replaceRouteTableAssociation(
+				ReplaceRouteTableAssociation replaceRouteTableAssociation) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.replaceRouteTableAssociation(replaceRouteTableAssociation);
+		}
+
+		@Override
+		public AssociateRouteTableResponse associateRouteTable(
+				AssociateRouteTable associateRouteTable) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.associateRouteTable(associateRouteTable);
+		}
+
+		@Override
+		public DetachInternetGatewayResponse detachInternetGateway(
+				DetachInternetGateway detachInternetGateway) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.detachInternetGateway(detachInternetGateway);
+		}
+
+		@Override
+		public DescribeExportTasksResponse describeExportTasks(
+				DescribeExportTasks describeExportTasks) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.describeExportTasks(describeExportTasks);
+		}
+
+		@Override
+		public CreateInstanceExportTaskResponse createInstanceExportTask(
+				CreateInstanceExportTask createInstanceExportTask) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.createInstanceExportTask(createInstanceExportTask);
+		}
+
+		@Override
+		public AssignPrivateIpAddressesResponse assignPrivateIpAddresses(
+				AssignPrivateIpAddresses assignPrivateIpAddresses) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.assignPrivateIpAddresses(assignPrivateIpAddresses);
+		}
+
+		@Override
+		public ReportInstanceStatusResponse reportInstanceStatus(
+				ReportInstanceStatus reportInstanceStatus) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.reportInstanceStatus(reportInstanceStatus);
+		}
+
+		@Override
+		public DeleteInternetGatewayResponse deleteInternetGateway(
+				DeleteInternetGateway deleteInternetGateway) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.deleteInternetGateway(deleteInternetGateway);
+		}
+
+		@Override
+		public AttachNetworkInterfaceResponse attachNetworkInterface(
+				AttachNetworkInterface attachNetworkInterface) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.attachNetworkInterface(attachNetworkInterface);
+		}
+
+		@Override
+		public CreateNetworkInterfaceResponse createNetworkInterface(
+				CreateNetworkInterface createNetworkInterface) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.createNetworkInterface(createNetworkInterface);
+		}
+
+		@Override
+		public RevokeSecurityGroupEgressResponse revokeSecurityGroupEgress(
+				RevokeSecurityGroupEgress revokeSecurityGroupEgress) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.revokeSecurityGroupEgress(revokeSecurityGroupEgress);
+		}
+
+		@Override
+		public ReplaceRouteResponse replaceRoute(ReplaceRoute replaceRoute) {
+			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
+			return ec2Service.replaceRoute(replaceRoute);
+	
+		}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/135b688a/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 f6ac971..3e3f578 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
@@ -122,8 +122,9 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 	public AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngress(AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress) {
         AuthorizeSecurityGroupIngressType sgit = authorizeSecurityGroupIngress.getAuthorizeSecurityGroupIngress();        
         IpPermissionSetType ipPerms = sgit.getIpPermissions();
-        
-        EC2AuthorizeRevokeSecurityGroup request = toSecurityGroup( sgit.getGroupName(), ipPerms.getItem());
+
+        EC2AuthorizeRevokeSecurityGroup request = toSecurityGroup(
+                sgit.getAuthorizeSecurityGroupIngressTypeChoice_type0().getGroupName(), ipPerms.getItem());
 		return toAuthorizeSecurityGroupIngressResponse( engine.authorizeSecurityGroup( request ));
 	}
 
@@ -132,8 +133,9 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 	{
         RevokeSecurityGroupIngressType sgit = revokeSecurityGroupIngress.getRevokeSecurityGroupIngress();        
         IpPermissionSetType ipPerms = sgit.getIpPermissions();
-        
-        EC2AuthorizeRevokeSecurityGroup request = toSecurityGroup( sgit.getGroupName(), ipPerms.getItem());
+
+        EC2AuthorizeRevokeSecurityGroup request = toSecurityGroup(
+                sgit.getRevokeSecurityGroupIngressTypeChoice_type0().getGroupName(), ipPerms.getItem());
 		return toRevokeSecurityGroupIngressResponse( engine.revokeSecurityGroup( request ));
 	}
 
@@ -478,8 +480,8 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
     @Override
     public ReleaseAddressResponse releaseAddress(ReleaseAddress releaseAddress) {
     	EC2ReleaseAddress request = new EC2ReleaseAddress();
-    	
-    	request.setPublicIp(releaseAddress.getReleaseAddress().getPublicIp());
+
+        request.setPublicIp(releaseAddress.getReleaseAddress().getReleaseAddressTypeChoice_type0().getPublicIp());
     	
         return toReleaseAddressResponse( engine.releaseAddress( request ) );
     }
@@ -487,10 +489,12 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
     @Override
     public AssociateAddressResponse associateAddress(AssociateAddress associateAddress) {
     	EC2AssociateAddress request = new EC2AssociateAddress();
-    	
-    	request.setPublicIp(associateAddress.getAssociateAddress().getPublicIp());
-    	request.setInstanceId(associateAddress.getAssociateAddress().getInstanceId());
-    	
+	
+        request.setPublicIp( associateAddress.getAssociateAddress().
+                getAssociateAddressTypeChoice_type0().getPublicIp());
+        request.setInstanceId(associateAddress.getAssociateAddress().
+                getAssociateAddressTypeChoice_type1().getInstanceId());
+
         return toAssociateAddressResponse( engine.associateAddress( request ) );
     }
 
@@ -794,7 +798,12 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 		if (null != gst) {
 			GroupItemType[] items = gst.getItem();
 			if (null != items) {
-				for( int i=0; i < items.length; i++ ) request.addGroupName(items[i].getGroupId());
+                for( int i=0; i < items.length; i++ ) {
+                    if ( items[i].getGroupName() != null) // either SG-name or SG-id can be provided
+                        request.addSecuritGroupName( items[i].getGroupName());
+                    else
+                        request.addSecuritGroupId( items[i].getGroupId());
+                }
 		    }
 		}
 		return toRunInstancesResponse( engine.runInstances( request ), engine);
@@ -973,6 +982,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 		    ProductCodesSetType param4 = new ProductCodesSetType();
 	        ProductCodesSetItemType param5 = new ProductCodesSetItemType();
 	        param5.setProductCode( "" );
+            param5.setType("");
             param4.addItem( param5 );		    
 		    param3.setProductCodes( param4 );
 		    
@@ -1342,6 +1352,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 	        param3.setSnapshotId(snapId);
 	        param3.setAvailabilityZone( vol.getZoneName());
 	        param3.setStatus( vol.getState());
+	        param3.setVolumeType("standard");
 	        
         	// -> CloudStack seems to have issues with timestamp formats so just in case
 	        Calendar cal = EC2RestAuth.parseDateString(vol.getCreated());
@@ -1427,11 +1438,13 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
             if (null == groups || 0 == groups.length) {
                 GroupItemType param5 = new GroupItemType();
                 param5.setGroupId("");
+                param5.setGroupName("");
                 param4.addItem( param5 );
             } else {
                 for (EC2SecurityGroup group : groups) {
                     GroupItemType param5 = new GroupItemType();
                     param5.setGroupId(group.getId());
+                    param5.setGroupName("");
                     param4.addItem( param5 );
                 }
             }
@@ -1458,6 +1471,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 	        ProductCodesSetType param9 = new ProductCodesSetType();
 	        ProductCodesSetItemType param10 = new ProductCodesSetItemType();
 	        param10.setProductCode( "" );
+            param10.setType("");
             param9.addItem( param10 );
 	        param7.setProductCodes( param9 );
 	        
@@ -1494,7 +1508,13 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
             param7.setRootDeviceType( "" );
         	String devicePath = engine.cloudDeviceIdToDevicePath( inst.getHypervisor(), inst.getRootDeviceId());
             param7.setRootDeviceName( devicePath );
-            
+
+            GroupSetType param14 = new GroupSetType();
+            GroupItemType param15 = new GroupItemType(); // VPC security group
+            param15.setGroupName("");
+            param15.setGroupName("");
+            param14.addItem(param15);
+            param7.setGroupSet(param14);
 
             param7.setInstanceLifecycle( "" );
             param7.setSpotInstanceRequestId( "" );
@@ -1542,6 +1562,8 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
     	AllocateAddressResponseType param1 = new AllocateAddressResponseType();
     	
     	param1.setPublicIp(ec2Address.getIpAddress());
+        param1.setDomain("standard");
+        param1.setAllocationId("");
     	param1.setRequestId(UUID.randomUUID().toString());
     	response.setAllocateAddressResponse(param1);
     	return response;
@@ -1561,7 +1583,8 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
     public static AssociateAddressResponse toAssociateAddressResponse(final boolean result) {
     	AssociateAddressResponse response = new AssociateAddressResponse();
     	AssociateAddressResponseType param1 = new AssociateAddressResponseType();
-    	
+
+        param1.setAssociationId("");
     	param1.setRequestId(UUID.randomUUID().toString());
     	param1.set_return(result);
     	
@@ -1761,6 +1784,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 	        ProductCodesSetType param9 = new ProductCodesSetType();
 	        ProductCodesSetItemType param10 = new ProductCodesSetItemType();
 	        param10.setProductCode( "" );
+            param10.setType("");
             param9.addItem( param10 );
 	        param7.setProductCodes( param9 );
 	        
@@ -1809,7 +1833,14 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
             param19.setValue("");
             param18.addItem( param19 );
             param7.setTagSet( param18 );          
-            
+
+            GroupSetType param14 = new GroupSetType();
+            GroupItemType param15 = new GroupItemType();
+            param15.setGroupId("");
+            param15.setGroupName("");
+            param14.addItem(param15);
+            param7.setGroupSet(param14);
+
             String hypervisor = inst.getHypervisor();
             param7.setHypervisor((null != hypervisor ? hypervisor : ""));
 	        param6.addItem( param7 );
@@ -1907,6 +1938,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
         }
 		param1.setCreateTime( cal );
 
+        param1.setVolumeType("standard");
 		param1.setRequestId( UUID.randomUUID().toString());
         response.setCreateVolumeResponse( param1 );
 		return response;
@@ -2040,6 +2072,8 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 			param3.setGroupName(group.getName());
 			String desc = group.getDescription();
 			param3.setGroupDescription((null != desc ? desc : ""));
+            param3.setGroupId(group.getId());
+            param3.setVpcId("");
 
 			IpPermissionSetType param4 = new IpPermissionSetType();
 			EC2IpPermission[] perms = group.getIpPermissionSet();
@@ -2101,11 +2135,16 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 		return response;
 	}
 	
-	public static CreateSecurityGroupResponse toCreateSecurityGroupResponse( boolean success ) {
+
+    public static CreateSecurityGroupResponse toCreateSecurityGroupResponse( EC2SecurityGroup sg ) {
 		CreateSecurityGroupResponse response = new CreateSecurityGroupResponse();
 		CreateSecurityGroupResponseType param1 = new CreateSecurityGroupResponseType();
 
-		param1.set_return(success);
+        param1.setGroupId( sg.getId() );
+        if ( sg.getId() != null )
+            param1.set_return(true);
+        else
+            param1.set_return(false);
 		param1.setRequestId( UUID.randomUUID().toString());
 		response.setCreateSecurityGroupResponse( param1 );
 		return response;
@@ -2540,4 +2579,295 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 	public ResetSnapshotAttributeResponse resetSnapshotAttribute(ResetSnapshotAttribute resetSnapshotAttribute) {
 		throw new EC2ServiceException(ClientError.Unsupported, "This operation is not available");
 	}
+	
+
+	public ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute(
+			ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CreateRouteTableResponse createRouteTable(
+			CreateRouteTable createRouteTable) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CreateNetworkAclEntryResponse createNetworkAclEntry(
+			CreateNetworkAclEntry createNetworkAclEntry) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DescribeVolumeAttributeResponse describeVolumeAttribute(
+			DescribeVolumeAttribute describeVolumeAttribute) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DeleteNetworkInterfaceResponse deleteNetworkInterface(
+			DeleteNetworkInterface deleteNetworkInterface) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CreateInternetGatewayResponse createInternetGateway(
+			CreateInternetGateway createInternetGateway) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DisassociateRouteTableResponse disassociateRouteTable(
+			DisassociateRouteTable disassociateRouteTable) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public ReplaceNetworkAclEntryResponse replaceNetworkAclEntry(
+			ReplaceNetworkAclEntry replaceNetworkAclEntry) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public AuthorizeSecurityGroupEgressResponse authorizeSecurityGroupEgress(
+			AuthorizeSecurityGroupEgress authorizeSecurityGroupEgress) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DeleteNetworkAclEntryResponse deleteNetworkAclEntry(
+			DeleteNetworkAclEntry deleteNetworkAclEntry) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DeleteRouteTableResponse deleteRouteTable(
+			DeleteRouteTable deleteRouteTable) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DescribeNetworkInterfaceAttributeResponse describeNetworkInterfaceAttribute(
+			DescribeNetworkInterfaceAttribute describeNetworkInterfaceAttribute) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CreateReservedInstancesListingResponse createReservedInstancesListing(
+			CreateReservedInstancesListing createReservedInstancesListing) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CreateNetworkAclResponse createNetworkAcl(
+			CreateNetworkAcl createNetworkAcl) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public ModifyVolumeAttributeResponse modifyVolumeAttribute(
+			ModifyVolumeAttribute modifyVolumeAttribute) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public ReplaceNetworkAclAssociationResponse replaceNetworkAclAssociation(
+			ReplaceNetworkAclAssociation replaceNetworkAclAssociation) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public EnableVgwRoutePropagationResponse enableVgwRoutePropagation(
+			EnableVgwRoutePropagation enableVgwRoutePropagation) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public UnassignPrivateIpAddressesResponse unassignPrivateIpAddresses(
+			UnassignPrivateIpAddresses unassignPrivateIpAddresses) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DeleteVpnConnectionRouteResponse deleteVpnConnectionRoute(
+			DeleteVpnConnectionRoute deleteVpnConnectionRoute) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CancelReservedInstancesListingResponse cancelReservedInstancesListing(
+			CancelReservedInstancesListing cancelReservedInstancesListing) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DescribeNetworkAclsResponse describeNetworkAcls(
+			DescribeNetworkAcls describeNetworkAcls) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public EnableVolumeIOResponse enableVolumeIO(EnableVolumeIO enableVolumeIO) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DescribeInternetGatewaysResponse describeInternetGateways(
+			DescribeInternetGateways describeInternetGateways) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DescribeReservedInstancesListingsResponse describeReservedInstancesListings(
+			DescribeReservedInstancesListings describeReservedInstancesListings) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DescribeInstanceStatusResponse describeInstanceStatus(
+			DescribeInstanceStatus describeInstanceStatus) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute(
+			ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DisableVgwRoutePropagationResponse disableVgwRoutePropagation(
+			DisableVgwRoutePropagation disableVgwRoutePropagation) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DescribeVolumeStatusResponse describeVolumeStatus(
+			DescribeVolumeStatus describeVolumeStatus) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DetachNetworkInterfaceResponse detachNetworkInterface(
+			DetachNetworkInterface detachNetworkInterface) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DescribeNetworkInterfacesResponse describeNetworkInterfaces(
+			DescribeNetworkInterfaces describeNetworkInterfaces) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CancelExportTaskResponse cancelExportTask(
+			CancelExportTask cancelExportTask) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CreateRouteResponse createRoute(CreateRoute createRoute) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DescribeRouteTablesResponse describeRouteTables(
+			DescribeRouteTables describeRouteTables) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DeleteNetworkAclResponse deleteNetworkAcl(
+			DeleteNetworkAcl deleteNetworkAcl) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DeleteRouteResponse deleteRoute(DeleteRoute deleteRoute) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CreateVpnConnectionRouteResponse createVpnConnectionRoute(
+			CreateVpnConnectionRoute createVpnConnectionRoute) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public AttachInternetGatewayResponse attachInternetGateway(
+			AttachInternetGateway attachInternetGateway) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public ReplaceRouteTableAssociationResponse replaceRouteTableAssociation(
+			ReplaceRouteTableAssociation replaceRouteTableAssociation) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public AssociateRouteTableResponse associateRouteTable(
+			AssociateRouteTable associateRouteTable) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DetachInternetGatewayResponse detachInternetGateway(
+			DetachInternetGateway detachInternetGateway) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DescribeExportTasksResponse describeExportTasks(
+			DescribeExportTasks describeExportTasks) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CreateInstanceExportTaskResponse createInstanceExportTask(
+			CreateInstanceExportTask createInstanceExportTask) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public AssignPrivateIpAddressesResponse assignPrivateIpAddresses(
+			AssignPrivateIpAddresses assignPrivateIpAddresses) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public ReportInstanceStatusResponse reportInstanceStatus(
+			ReportInstanceStatus reportInstanceStatus) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public DeleteInternetGatewayResponse deleteInternetGateway(
+			DeleteInternetGateway deleteInternetGateway) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public AttachNetworkInterfaceResponse attachNetworkInterface(
+			AttachNetworkInterface attachNetworkInterface) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public CreateNetworkInterfaceResponse createNetworkInterface(
+			CreateNetworkInterface createNetworkInterface) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public RevokeSecurityGroupEgressResponse revokeSecurityGroupEgress(
+			RevokeSecurityGroupEgress revokeSecurityGroupEgress) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
+
+	public ReplaceRouteResponse replaceRoute(ReplaceRoute replaceRoute) {
+		throw new EC2ServiceException(ClientError.Unsupported,
+				"This operation is not available");
+	}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/135b688a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
index 715c83e..9d569d4 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -25,7 +25,6 @@ import java.security.SignatureException;
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -111,7 +110,7 @@ public class EC2Engine extends ManagerBase {
 
 
     /**
-     * Which management server to we talk to?  
+     * Which management server to we talk to?
      * Load a mapping form Amazon values for 'instanceType' to cloud defined
      * diskOfferingId and serviceOfferingId.
      * 
@@ -176,7 +175,7 @@ public class EC2Engine extends ManagerBase {
         if (_eng == null) {
             _eng = new CloudStackApi(managementServer, cloudAPIPort, false);
         }
-        // regardless of whether _eng is initialized, we must make sure 
+        // regardless of whether _eng is initialized, we must make sure
         // access/secret keys are current with what's in the UserCredentials
         _eng.setApiKey(UserContext.current().getAccessKey());
         _eng.setSecretKey(UserContext.current().getSecretKey());
@@ -206,7 +205,7 @@ public class EC2Engine extends ManagerBase {
         }
 
         try {
-            oldApiKey = _eng.getApiKey(); 
+            oldApiKey = _eng.getApiKey();
             oldSecretKey = _eng.getSecretKey();
         } catch(Exception e) {
             // we really don't care, and expect this
@@ -236,18 +235,18 @@ public class EC2Engine extends ManagerBase {
      * @param groupDesc
      * @return
      */
-    public Boolean createSecurityGroup(String groupName, String groupDesc) {
+    public EC2SecurityGroup createSecurityGroup(String groupName, String groupDesc) {
+        EC2SecurityGroup sg = new EC2SecurityGroup();
         try {
             CloudStackSecurityGroup grp = getApi().createSecurityGroup(groupName, null, groupDesc, null);
             if (grp != null && grp.getId() != null) {
-                return true;
+            	sg.setId(grp.getId());
             }
-            return false;
         } catch( Exception e ) {
             logger.error( "EC2 CreateSecurityGroup - ", e);
             handleException(e);
         }
-        return false;
+        return sg;
     }
 
     /**
@@ -292,15 +291,15 @@ public class EC2Engine extends ManagerBase {
     }
 
     /**
-     * CloudStack supports revoke only by using the ruleid of the ingress rule.   
+     * CloudStack supports revoke only by using the ruleid of the ingress rule.
      * We list all security groups and find the matching group and use the first ruleId we find.
      * 
      * @param request
      * @return
      */
-    public boolean revokeSecurityGroup( EC2AuthorizeRevokeSecurityGroup request ) 
+    public boolean revokeSecurityGroup( EC2AuthorizeRevokeSecurityGroup request )
     {
-        try {   
+        try {
             String[] groupSet = new String[1];
             groupSet[0] = request.getName();
             String ruleId = null;
@@ -346,7 +345,7 @@ public class EC2Engine extends ManagerBase {
             for (EC2IpPermission ipPerm : items) {
                 EC2SecurityGroup[] groups = ipPerm.getUserSet();
 
-                List<CloudStackKeyValue> secGroupList = new ArrayList<CloudStackKeyValue>(); 
+                List<CloudStackKeyValue> secGroupList = new ArrayList<CloudStackKeyValue>();
                 for (EC2SecurityGroup group : groups) {
                     CloudStackKeyValue pair = new CloudStackKeyValue();
                     pair.setKeyValue(group.getAccount(), group.getName());
@@ -354,12 +353,12 @@ public class EC2Engine extends ManagerBase {
                 }
                 CloudStackSecurityGroup resp = null;
                 if (ipPerm.getProtocol().equalsIgnoreCase("icmp")) {
-                    resp = getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, null, 
-                            ipPerm.getIcmpCode(), ipPerm.getIcmpType(), ipPerm.getProtocol(), null, 
+                    resp = getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, null,
+                            ipPerm.getIcmpCode(), ipPerm.getIcmpType(), ipPerm.getProtocol(), null,
                             request.getName(), null, secGroupList);
                 } else {
-                    resp = getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, 
-                            ipPerm.getToPort().longValue(), null, null, ipPerm.getProtocol(), null, request.getName(), 
+                    resp = getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null,
+                            ipPerm.getToPort().longValue(), null, null, ipPerm.getProtocol(), null, request.getName(),
                             ipPerm.getFromPort().longValue(), secGroupList);
                 }
                 if (resp != null ){
@@ -418,12 +417,12 @@ public class EC2Engine extends ManagerBase {
             matches++;
         }
 
-        // -> is the port(s) from the request (left) a match of the rule's port(s) 
+        // -> is the port(s) from the request (left) a match of the rule's port(s)
         if (0 != permLeft.getFromPort()) {
             // -> -1 means all ports match
             if (-1 != permLeft.getFromPort()) {
-                if (permLeft.getFromPort().compareTo(permRight.getFromPort()) != 0 || 
-                        permLeft.getToPort().compareTo(permRight.getToPort()) != 0) 
+                if (permLeft.getFromPort().compareTo(permRight.getFromPort()) != 0 ||
+                        permLeft.getToPort().compareTo(permRight.getToPort()) != 0)
                     return null;
             }
             matches++;
@@ -431,7 +430,7 @@ public class EC2Engine extends ManagerBase {
 
 
         // -> was permLeft set up properly with at least one property to match?
-        if ( 0 == matches ) 
+        if ( 0 == matches )
             return null;
         else return permRight.getRuleId();
     }
@@ -442,13 +441,13 @@ public class EC2Engine extends ManagerBase {
      * @param request
      * @return
      */
-    public EC2DescribeSnapshotsResponse describeSnapshots( EC2DescribeSnapshots request ) 
+    public EC2DescribeSnapshotsResponse describeSnapshots( EC2DescribeSnapshots request )
     {
         EC2DescribeSnapshotsResponse response = new EC2DescribeSnapshotsResponse();
         EC2SnapshotFilterSet sfs = request.getFilterSet();
         EC2TagKeyValue[] tagKeyValueSet = request.getResourceTagSet();
 
-        try { 
+        try {
             response = listSnapshots( request.getSnapshotSet(),
                     getResourceTags(tagKeyValueSet));
             if (response == null) {
@@ -549,7 +548,7 @@ public class EC2Engine extends ManagerBase {
      * @param request
      * @return
      */
-    public boolean modifyImageAttribute( EC2ModifyImageAttribute request ) 
+    public boolean modifyImageAttribute( EC2ModifyImageAttribute request )
     {
         try {
             if(request.getAttribute().equals(ImageAttribute.launchPermission)){
@@ -681,7 +680,7 @@ public class EC2Engine extends ManagerBase {
         String keyPairName = request.getKeyName();
         try {
             resp = getApi().deleteSSHKeyPair(keyPairName, null, null);
-            if (resp == null) { 
+            if (resp == null) {
                 throw new Exception("Ivalid CloudStack API response");
             }
         } catch(Exception e) {
@@ -866,7 +865,7 @@ public class EC2Engine extends ManagerBase {
             } else {
                 ec2Address.setIpAddress(resp.getIpAddress());
             }
-        } catch(Exception e) { 
+        } catch(Exception e) {
             logger.error( "EC2 AllocateAddress - ", e);
             handleException(e);
         }
@@ -905,7 +904,7 @@ public class EC2Engine extends ManagerBase {
     /**
      * Create a template
      * Amazon API just gives us the instanceId to create the template from.
-     * But our createTemplate function requires the volumeId and osTypeId.  
+     * But our createTemplate function requires the volumeId and osTypeId.
      * So to get that we must make the following sequence of cloud API calls:
      * 1) listVolumes&virtualMachineId=   -- gets the volumeId
      * 2) listVirtualMachinees&id=        -- gets the templateId
@@ -917,7 +916,7 @@ public class EC2Engine extends ManagerBase {
      * @param request
      * @return
      */
-    public EC2CreateImageResponse createImage(EC2CreateImage request) 
+    public EC2CreateImageResponse createImage(EC2CreateImage request)
     {
         EC2CreateImageResponse response = new EC2CreateImageResponse();
         boolean needsRestart = false;
@@ -935,7 +934,7 @@ public class EC2Engine extends ManagerBase {
                         needsRestart = true;
                         if (!stopVirtualMachine( request.getInstanceId() ))
                             throw new Exception("Instance must be in a stopped state");
-                    }           		 
+                    }
                     volumeId = vol.getId();
                     break;
                 }
@@ -952,7 +951,7 @@ public class EC2Engine extends ManagerBase {
             EC2Image[] imageSet = images.getImageSet();
             String osTypeId = imageSet[0].getOsTypeId();
 
-            CloudStackTemplate resp = getApi().createTemplate((request.getDescription() == null ? "" : request.getDescription()), request.getName(), 
+            CloudStackTemplate resp = getApi().createTemplate((request.getDescription() == null ? "" : request.getDescription()), request.getName(),
                     osTypeId, null, null, null, null, null, null, volumeId);
             if (resp == null || resp.getId() == null) {
                 throw new Exception("Image couldn't be created");
@@ -975,15 +974,15 @@ public class EC2Engine extends ManagerBase {
 
     /**
      * Register a template
-     *  
+     * 
      * @param request
      * @return
      */
     public EC2CreateImageResponse registerImage(EC2RegisterImage request) {
         EC2CreateImageResponse image = new EC2CreateImageResponse();
         try {
-            List<CloudStackTemplate> templates = getApi().registerTemplate((request.getDescription() == null ? request.getName() : request.getDescription()), 
-                    request.getFormat(), request.getHypervisor(), request.getName(), toOSTypeId(request.getOsTypeName()), request.getLocation(), 
+            List<CloudStackTemplate> templates = getApi().registerTemplate((request.getDescription() == null ? request.getName() : request.getDescription()),
+                    request.getFormat(), request.getHypervisor(), request.getName(), toOSTypeId(request.getOsTypeName()), request.getLocation(),
                     toZoneId(request.getZoneName(), null), null, null, null, null, null, null, null, null, null);
             if (templates != null) {
                 // technically we will only ever register a single template...
@@ -1009,7 +1008,7 @@ public class EC2Engine extends ManagerBase {
      * @param image
      * @return
      */
-    public boolean deregisterImage( EC2Image image ) 
+    public boolean deregisterImage( EC2Image image )
     {
         try {
             CloudStackInfoResponse resp = getApi().deleteTemplate(image.getId(), null);
@@ -1046,7 +1045,7 @@ public class EC2Engine extends ManagerBase {
      * @param request
      * @return
      */
-    public EC2DescribeAvailabilityZonesResponse describeAvailabilityZones(EC2DescribeAvailabilityZones request) {	
+    public EC2DescribeAvailabilityZonesResponse describeAvailabilityZones(EC2DescribeAvailabilityZones request) {
         EC2DescribeAvailabilityZonesResponse availableZones = new EC2DescribeAvailabilityZonesResponse();
         try {
             availableZones = listZones(request.getZoneSet(), null);
@@ -1070,16 +1069,16 @@ public class EC2Engine extends ManagerBase {
         EC2DescribeVolumesResponse volumes = new EC2DescribeVolumesResponse();
         EC2VolumeFilterSet vfs = request.getFilterSet();
         EC2TagKeyValue[] tagKeyValueSet = request.getResourceTagSet();
-        try {   
+        try {
             String[] volumeIds = request.getVolumeSet();
             if ( 0 == volumeIds.length ){
                 volumes = listVolumes( null, null, volumes, getResourceTags(tagKeyValueSet) );
-            } else {     
-                for (String s : volumeIds) 
+            } else {
+                for (String s : volumeIds)
                     volumes = listVolumes(s, null, volumes, getResourceTags(tagKeyValueSet) );
             }
             if ( vfs != null )
-                volumes = vfs.evaluate( volumes );     
+                volumes = vfs.evaluate( volumes );
         }  catch( Exception e ) {
             logger.error( "EC2 DescribeVolumes - ", e);
             handleException(e);
@@ -1095,7 +1094,7 @@ public class EC2Engine extends ManagerBase {
      */
     public EC2Volume attachVolume( EC2Volume request ) {
         EC2Volume resp = new EC2Volume();
-        try {   
+        try {
             request.setDeviceId(mapDeviceToCloudDeviceId(request.getDevice()));
             CloudStackVolume vol = getApi().attachVolume(request.getId(), request.getInstanceId(), request.getDeviceId());
             if(vol != null) {
@@ -1327,12 +1326,12 @@ public class EC2Engine extends ManagerBase {
      * @param request
      * @return
      */
-    public boolean rebootInstances(EC2RebootInstances request) 
+    public boolean rebootInstances(EC2RebootInstances request)
     {
         EC2Instance[] vms = null;
 
         // -> reboot is not allowed on destroyed (i.e., terminated) instances
-        try {   
+        try {
             String[] instanceSet = request.getInstancesSet();
             EC2DescribeInstancesResponse previousState = listVirtualMachines( instanceSet, null, null );
             vms = previousState.getInstanceSet();
@@ -1347,7 +1346,7 @@ public class EC2Engine extends ManagerBase {
             }
 
             // -> if some specified VMs where not found we have to tell the caller
-            if (instanceSet.length != vms.length) 
+            if (instanceSet.length != vms.length)
                 throw new Exception("One or more instanceIds do not exist, other instances rebooted.");
 
             return true;
@@ -1359,7 +1358,7 @@ public class EC2Engine extends ManagerBase {
     }
 
     /**
-     * Using a template (AMI), launch n instances 
+     * Using a template (AMI), launch n instances
      * 
      * @param request
      * @return
@@ -1369,6 +1368,8 @@ public class EC2Engine extends ManagerBase {
         int createInstances    = 0;
         int canCreateInstances = -1;
         int countCreated       = 0;
+        String groupIds   = null;
+        String groupNames = null;
 
         try {
             // ugly...
@@ -1380,14 +1381,14 @@ public class EC2Engine extends ManagerBase {
                 throw new Exception("Min Count is greater than the number of instances left to allocate");
             }
 
-            if ( canCreateInstances < request.getMaxCount()) 
+            if ( canCreateInstances < request.getMaxCount())
                 createInstances = request.getMinCount();
-            else 
+            else
                 createInstances = request.getMaxCount();
 
             //find CS service Offering ID
             String instanceType = "m1.small";
-            if(request.getInstanceType() != null){ 
+            if(request.getInstanceType() != null){
                 instanceType = request.getInstanceType();
             }
             CloudStackServiceOfferingVO svcOffering = getCSServiceOfferingId(instanceType);
@@ -1410,13 +1411,25 @@ public class EC2Engine extends ManagerBase {
             // network
             //CloudStackNetwork network = findNetwork(zone);
 
+            // for EC2 security groups either a group ID or a group name is accepted
+            String[] sgIdList = request.getSecurityGroupIdSet();
+            String[] sgNameList = request.getSecurityGroupNameSet();
+            if (sgIdList.length != 0 && sgNameList.length != 0)
+                throw new EC2ServiceException(ClientError.InvalidParameterCombination,
+                        " for EC2 groups either a group ID or a group name is accepted");
+
+            if (sgIdList.length != 0)
+                groupIds = constructList(sgIdList);
+            if (sgNameList.length != 0)
+                groupNames = constructList(sgNameList);
+
             // now actually deploy the vms
             for( int i=0; i < createInstances; i++ ) {
                 try{
-                    CloudStackUserVm resp = getApi().deployVirtualMachine(svcOffering.getId(), 
+                    CloudStackUserVm resp = getApi().deployVirtualMachine(svcOffering.getId(),
                             request.getTemplateId(), zoneId, null, null, null, null,
                             null, null, null, request.getKeyName(), null, null,
-                            null, constructList(request.getGroupSet()), request.getSize().longValue(), request.getUserData());
+                            groupIds, groupNames, request.getSize().longValue(), request.getUserData());
                     EC2Instance vm = new EC2Instance();
                     vm.setId(resp.getId().toString());
                     vm.setName(resp.getName());
@@ -1480,7 +1493,7 @@ public class EC2Engine extends ManagerBase {
             EC2DescribeInstancesResponse previousState = listVirtualMachines( request.getInstancesSet(), null, null );
             vms = previousState.getInstanceSet();
 
-            // -> send start requests for each item 
+            // -> send start requests for each item
             for (EC2Instance vm : vms) {
                 vm.setPreviousState(vm.getState());
 
@@ -1516,14 +1529,14 @@ public class EC2Engine extends ManagerBase {
         EC2Instance[] virtualMachines = null;
 
         // -> first determine the current state of each VM (becomes it previous state)
-        try {   
+        try {
             String[] instanceSet = request.getInstancesSet();
             Boolean forced = request.getForce();
 
             EC2DescribeInstancesResponse previousState = listVirtualMachines( instanceSet, null, null );
             virtualMachines = previousState.getInstanceSet();
 
-            // -> send stop requests for each item 
+            // -> send stop requests for each item
             for (EC2Instance vm : virtualMachines) {
                 vm.setPreviousState( vm.getState());
                 CloudStackUserVm resp = null;
@@ -1594,14 +1607,14 @@ public class EC2Engine extends ManagerBase {
     }
 
     /**
-     * RunInstances includes a min and max count of requested instances to create.  
+     * RunInstances includes a min and max count of requested instances to create.
      * We have to be able to create the min number for the user or none at all.  So
-     * here we determine what the user has left to create. 
+     * here we determine what the user has left to create.
      * 
      * @return -1 means no limit exists, other positive numbers give max number left that
      *         the user can create.
      */
-    private int calculateAllowedInstances() throws Exception {    
+    private int calculateAllowedInstances() throws Exception {
         int maxAllowed = -1;
 
         CloudStackAccount ourAccount = getCurrentAccount();
@@ -1612,16 +1625,16 @@ public class EC2Engine extends ManagerBase {
             return -99999;
         }
 
-        // if accountType is Admin == 1, then let's return -1 
+        // if accountType is Admin == 1, then let's return -1
         if (ourAccount.getAccountType() == 1) return -1;
 
         // -> get the user limits on instances
-        // "0" represents instances:  
+        // "0" represents instances:
         // http://download.cloud.com/releases/2.2.0/api_2.2.8/user/listResourceLimits.html
         List<CloudStackResourceLimit> limits = getApi().listResourceLimits(null, null, null, null, "0");
         if (limits != null && limits.size() > 0) {
             maxAllowed = (int)limits.get(0).getMax().longValue();
-            if (maxAllowed == -1) 
+            if (maxAllowed == -1)
                 return -1;   // no limit
 
             EC2DescribeInstancesResponse existingVMS = listVirtualMachines( null, null, null );
@@ -1639,7 +1652,7 @@ public class EC2Engine extends ManagerBase {
      * @param ifs - filter out unwanted instances
      */
     private EC2DescribeInstancesResponse listVirtualMachines( String[] virtualMachineIds, EC2InstanceFilterSet ifs,
-            List<CloudStackKeyValue> resourceTags ) throws Exception 
+            List<CloudStackKeyValue> resourceTags ) throws Exception
             {
         EC2DescribeInstancesResponse instances = new EC2DescribeInstancesResponse();
 
@@ -1653,10 +1666,10 @@ public class EC2Engine extends ManagerBase {
 
         if ( null == ifs )
             return instances;
-        else return ifs.evaluate( instances );     
+        else return ifs.evaluate( instances );
             }
 
-    /**  
+    /**
      * Get one or more templates depending on the volumeId parameter.
      * 
      * @param volumeId   - if interested in one specific volume, null if want to list all volumes
@@ -1714,7 +1727,7 @@ public class EC2Engine extends ManagerBase {
     }
 
     /**
-     * Translate the given zone name into the required zoneId.  Query for 
+     * Translate the given zone name into the required zoneId.  Query for
      * a list of all zones and match the zone name given.   Amazon uses zone
      * names while the Cloud API often requires the zoneId.
      * 
@@ -1768,7 +1781,7 @@ public class EC2Engine extends ManagerBase {
      * 
      * @param serviceOfferingId
      * @return A valid value for the Amazon defined instanceType
-     * @throws SQLException, ClassNotFoundException, IllegalAccessException, InstantiationException 
+     * @throws SQLException, ClassNotFoundException, IllegalAccessException, InstantiationException
      */
     private String serviceOfferingIdToInstanceType( String serviceOfferingId ) throws Exception {
         try{
@@ -1787,13 +1800,13 @@ public class EC2Engine extends ManagerBase {
     }
 
     /**
-     * Match the value in the 'description' field of the listOsTypes response to get 
+     * Match the value in the 'description' field of the listOsTypes response to get
      * the osTypeId.
      * 
      * @param osTypeName
-     * @return the Cloud.com API osTypeId 
+     * @return the Cloud.com API osTypeId
      */
-    private String toOSTypeId( String osTypeName ) throws Exception { 
+    private String toOSTypeId( String osTypeName ) throws Exception {
         try {
             List<CloudStackOsType> osTypes = getApi().listOsTypes(null, null, null);
             for (CloudStackOsType osType : osTypes) {
@@ -1924,7 +1937,7 @@ public class EC2Engine extends ManagerBase {
     }
 
 
-    /**  
+    /**
      * Get one or more templates depending on the templateId parameter.
      * 
      * @param templateId - if null then return information on all existing templates, otherwise
@@ -1939,12 +1952,12 @@ public class EC2Engine extends ManagerBase {
             List<CloudStackTemplate> result = new ArrayList<CloudStackTemplate>();
 
             if(templateId != null){
-                List<CloudStackTemplate> template = getApi().listTemplates("executable", null, null, null, templateId , null, null, null); 
+                List<CloudStackTemplate> template = getApi().listTemplates("executable", null, null, null, templateId , null, null, null);
                 if(template != null){
                     result.addAll(template);
                 }
             }else{
-                List<CloudStackTemplate> selfExecutable = getApi().listTemplates("selfexecutable", null, null, null, null, null, null, null); 
+                List<CloudStackTemplate> selfExecutable = getApi().listTemplates("selfexecutable", null, null, null, null, null, null, null);
                 if(selfExecutable != null){
                     result.addAll(selfExecutable);
                 }
@@ -2214,7 +2227,7 @@ public class EC2Engine extends ManagerBase {
     public CloudStackAccount getCurrentAccount() throws Exception {
         if (currentAccount != null) {
             // verify this is the same account!!!
-            for (CloudStackUser user : currentAccount.getUser()) { 
+            for (CloudStackUser user : currentAccount.getUser()) {
                 if (user.getSecretkey() != null && user.getSecretkey().equalsIgnoreCase(UserContext.current().getSecretKey())) {
                     return currentAccount;
                 }
@@ -2247,7 +2260,7 @@ public class EC2Engine extends ManagerBase {
         List<CloudStackNetwork> networks = getApi().listNetworks(null, null, null, null, null, null, null, null, null, zoneId);
         List<CloudStackNetwork> netWithSecGroup = new ArrayList<CloudStackNetwork>();
         for (CloudStackNetwork network : networks ) {
-            if (!network.getNetworkOfferingAvailability().equalsIgnoreCase("unavailable") && network.getSecurityGroupEnabled()) 
+            if (!network.getNetworkOfferingAvailability().equalsIgnoreCase("unavailable") && network.getSecurityGroupEnabled())
                 netWithSecGroup.add(network);
         }
         // we'll take the first one
@@ -2255,7 +2268,7 @@ public class EC2Engine extends ManagerBase {
     }
 
     /**
-     * Create a network 
+     * Create a network
      * 
      * @param zoneId
      * @param offering
@@ -2264,7 +2277,7 @@ public class EC2Engine extends ManagerBase {
      * @throws Exception
      */
     private CloudStackNetwork createDefaultGuestNetwork(String zoneId, CloudStackNetworkOffering offering, CloudStackAccount owner) throws Exception {
-        return getApi().createNetwork(owner.getName() + "-network", owner.getName() + "-network",  offering.getId(), zoneId, owner.getName(), 
+        return getApi().createNetwork(owner.getName() + "-network", owner.getName() + "-network",  offering.getId(), zoneId, owner.getName(),
                 owner.getDomainId(), true, null, null, null, null, null, null, null, null);
     }
 
@@ -2288,24 +2301,24 @@ public class EC2Engine extends ManagerBase {
             if (networks != null && !networks.isEmpty()) {
                 //pick up the first required network from the network list
                 for (CloudStackNetwork network : networks)  {
-                    for (CloudStackNetworkOffering requiredOffering : reuquiredOfferings) { 
+                    for (CloudStackNetworkOffering requiredOffering : reuquiredOfferings) {
                         logger.debug("[reqd/virtual} offering: " + requiredOffering.getId() + " network " + network.getNetworkOfferingId());
                         if (network.getNetworkOfferingId().equals(requiredOffering.getId())) {
                             return network;
-                        }                
-                    } 
-                } 
+                        }
+                    }
+                }
             } else {
                 //create new network and return it
                 return createDefaultGuestNetwork(zoneId, reuquiredOfferings.get(0), caller);
             }
         } else {
-            //find all optional network offerings in the system 
+            //find all optional network offerings in the system
             List<CloudStackNetworkOffering> optionalOfferings = getApi().listNetworkOfferings("Optional", null, null, null, true, null, null, null, null, null, zoneId);
             if (optionalOfferings != null && !optionalOfferings.isEmpty()) {
                 if (networks != null && !networks.isEmpty()) {
                     for (CloudStackNetwork network : networks) {
-                        for (CloudStackNetworkOffering optionalOffering : optionalOfferings) { 
+                        for (CloudStackNetworkOffering optionalOffering : optionalOfferings) {
                             logger.debug("[optional] offering: " + optionalOffering.getId() + " network " + network.getNetworkOfferingId());
                             if (network.getNetworkOfferingId().equals(optionalOffering.getId())) {
                                 return network;
@@ -2338,7 +2351,7 @@ public class EC2Engine extends ManagerBase {
             return getNetworksWithSecurityGroupEnabled(zone.getId());
 
         } else {
-            return getNetworksWithoutSecurityGroupEnabled(zone.getId()); 
+            return getNetworksWithoutSecurityGroupEnabled(zone.getId());
         }
     }
 
@@ -2413,40 +2426,40 @@ public class EC2Engine extends ManagerBase {
 
 
     /**
-     * Translate the device name string into a Cloud Stack deviceId.   
+     * Translate the device name string into a Cloud Stack deviceId.
      * deviceId 3 is reserved for CDROM and 0 for the ROOT disk
      * 
      * @param device string
      * @return deviceId value
      */
-    private String mapDeviceToCloudDeviceId( String device ) throws Exception 
-    {	
+    private String mapDeviceToCloudDeviceId( String device ) throws Exception
+    {
         if (device.equalsIgnoreCase( "/dev/sdb"  )) return "1";
-        else if (device.equalsIgnoreCase( "/dev/sdc"  )) return "2"; 
-        else if (device.equalsIgnoreCase( "/dev/sde"  )) return "4"; 
-        else if (device.equalsIgnoreCase( "/dev/sdf"  )) return "5"; 
-        else if (device.equalsIgnoreCase( "/dev/sdg"  )) return "6"; 
-        else if (device.equalsIgnoreCase( "/dev/sdh"  )) return "7"; 
-        else if (device.equalsIgnoreCase( "/dev/sdi"  )) return "8"; 
-        else if (device.equalsIgnoreCase( "/dev/sdj"  )) return "9"; 
-
-        else if (device.equalsIgnoreCase( "/dev/xvdb" )) return "1";  
-        else if (device.equalsIgnoreCase( "/dev/xvdc" )) return "2";  
-        else if (device.equalsIgnoreCase( "/dev/xvde" )) return "4";  
-        else if (device.equalsIgnoreCase( "/dev/xvdf" )) return "5";  
-        else if (device.equalsIgnoreCase( "/dev/xvdg" )) return "6";  
-        else if (device.equalsIgnoreCase( "/dev/xvdh" )) return "7";  
-        else if (device.equalsIgnoreCase( "/dev/xvdi" )) return "8";  
-        else if (device.equalsIgnoreCase( "/dev/xvdj" )) return "9";  
-
-        else if (device.equalsIgnoreCase( "xvdb"      )) return "1";  
-        else if (device.equalsIgnoreCase( "xvdc"      )) return "2";  
-        else if (device.equalsIgnoreCase( "xvde"      )) return "4";  
-        else if (device.equalsIgnoreCase( "xvdf"      )) return "5";  
-        else if (device.equalsIgnoreCase( "xvdg"      )) return "6";  
-        else if (device.equalsIgnoreCase( "xvdh"      )) return "7";  
-        else if (device.equalsIgnoreCase( "xvdi"      )) return "8";  
-        else if (device.equalsIgnoreCase( "xvdj"      )) return "9";  
+        else if (device.equalsIgnoreCase( "/dev/sdc"  )) return "2";
+        else if (device.equalsIgnoreCase( "/dev/sde"  )) return "4";
+        else if (device.equalsIgnoreCase( "/dev/sdf"  )) return "5";
+        else if (device.equalsIgnoreCase( "/dev/sdg"  )) return "6";
+        else if (device.equalsIgnoreCase( "/dev/sdh"  )) return "7";
+        else if (device.equalsIgnoreCase( "/dev/sdi"  )) return "8";
+        else if (device.equalsIgnoreCase( "/dev/sdj"  )) return "9";
+
+        else if (device.equalsIgnoreCase( "/dev/xvdb" )) return "1";
+        else if (device.equalsIgnoreCase( "/dev/xvdc" )) return "2";
+        else if (device.equalsIgnoreCase( "/dev/xvde" )) return "4";
+        else if (device.equalsIgnoreCase( "/dev/xvdf" )) return "5";
+        else if (device.equalsIgnoreCase( "/dev/xvdg" )) return "6";
+        else if (device.equalsIgnoreCase( "/dev/xvdh" )) return "7";
+        else if (device.equalsIgnoreCase( "/dev/xvdi" )) return "8";
+        else if (device.equalsIgnoreCase( "/dev/xvdj" )) return "9";
+
+        else if (device.equalsIgnoreCase( "xvdb"      )) return "1";
+        else if (device.equalsIgnoreCase( "xvdc"      )) return "2";
+        else if (device.equalsIgnoreCase( "xvde"      )) return "4";
+        else if (device.equalsIgnoreCase( "xvdf"      )) return "5";
+        else if (device.equalsIgnoreCase( "xvdg"      )) return "6";
+        else if (device.equalsIgnoreCase( "xvdh"      )) return "7";
+        else if (device.equalsIgnoreCase( "xvdi"      )) return "8";
+        else if (device.equalsIgnoreCase( "xvdj"      )) return "9";
 
         else throw new Exception("Device is not supported");
     }
@@ -2457,7 +2470,7 @@ public class EC2Engine extends ManagerBase {
      * @param state
      * @return
      */
-    private String mapToAmazonVolState( String state ) 
+    private String mapToAmazonVolState( String state )
     {
         if (state.equalsIgnoreCase( "Allocated" ) ||
                 state.equalsIgnoreCase( "Creating"  ) ||
@@ -2465,7 +2478,7 @@ public class EC2Engine extends ManagerBase {
 
         if (state.equalsIgnoreCase( "Destroy"   )) return "deleting";
 
-        return "error"; 
+        return "error";
     }
 
     /**
@@ -2554,7 +2567,7 @@ public class EC2Engine extends ManagerBase {
 
     /**
      * Start an existing stopped instance(VM)
-     *  
+     * 
      * @param instanceId
      * @return
      * @throws Exception
@@ -2574,10 +2587,10 @@ public class EC2Engine extends ManagerBase {
     /**
      * Cloud Stack API takes a comma separated list as a parameter.
      * 
-     * @throws UnsupportedEncodingException 
+     * @throws UnsupportedEncodingException
      */
     private String constructList( String[] elements ) throws UnsupportedEncodingException {
-        if (null == elements || 0 == elements.length) return null;  	
+        if (null == elements || 0 == elements.length) return null;
         StringBuffer elementList = new StringBuffer();
 
         for( int i=0; i < elements.length; i++ ) {
@@ -2787,7 +2800,7 @@ public class EC2Engine extends ManagerBase {
                             "Not enough available addresses to satisfy your minimum request");
                 } else {
                     throw new EC2ServiceException( ServerError.InternalError, "There is insufficient capacity");
-                } 
+                }
             } else if (errorCode == 401) {
                 if ( errorMessage.contains("Unauthorized") ) {
                     throw new EC2ServiceException(ClientError.AuthFailure, "User not authorised");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/135b688a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstances.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstances.java
index e3735b5..9029faf 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstances.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstances.java
@@ -30,7 +30,8 @@ public class EC2RunInstances {
 	private int    maxCount;
 	private int    minCount;
     private Integer    size;  		// <- in gigs
-    private List<String> groupSet = new ArrayList<String>();
+    private List<String>  groupIdSet;
+    private List<String>  groupNameSet;
 	
 	public EC2RunInstances() {
 		instanceType = null;
@@ -42,6 +43,8 @@ public class EC2RunInstances {
 		maxCount     = 0;
 		minCount     = 0;
 		size		 = 0;
+        groupIdSet   = new ArrayList<String>();
+        groupNameSet = new ArrayList<String>();
 	}
 	
 	public void setInstanceType( String instanceType ) {
@@ -115,12 +118,21 @@ public class EC2RunInstances {
 	public void setSize(Integer size) {
 		this.size = size;
 	}
-	
-    public void addGroupName( String param ) {
-        groupSet.add( param );
+
+    public void addSecuritGroupId( String param ) {
+        groupIdSet.add( param );
     }
 		
-    public String[] getGroupSet() {
-        return groupSet.toArray(new String[0]);
+    public String[] getSecurityGroupIdSet() {
+        return groupIdSet.toArray(new String[0]);
+    }
+
+	public void addSecuritGroupName( String param ) {
+        groupNameSet.add( param );
     }
+		
+    public String[] getSecurityGroupNameSet() {
+        return groupNameSet.toArray(new String[0]);
+    }
+
 }


[24/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
new file mode 100644
index 0000000..1ea12e2
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
@@ -0,0 +1,544 @@
+
+/**
+ * CreateNetworkAclResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkAclResponseType bean class
+            */
+        
+        public  class CreateNetworkAclResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateNetworkAclResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for NetworkAcl
+                        */
+
+                        
+                                    protected com.amazon.ec2.NetworkAclType localNetworkAcl ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.NetworkAclType
+                           */
+                           public  com.amazon.ec2.NetworkAclType getNetworkAcl(){
+                               return localNetworkAcl;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkAcl
+                               */
+                               public void setNetworkAcl(com.amazon.ec2.NetworkAclType param){
+                            
+                                            this.localNetworkAcl=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkAclResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateNetworkAclResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateNetworkAclResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                            if (localNetworkAcl==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("networkAcl cannot be null!!");
+                                            }
+                                           localNetworkAcl.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkAcl"),
+                                               factory,xmlWriter);
+                                        
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkAcl"));
+                            
+                            
+                                    if (localNetworkAcl==null){
+                                         throw new org.apache.axis2.databinding.ADBException("networkAcl cannot be null!!");
+                                    }
+                                    elementList.add(localNetworkAcl);
+                                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkAclResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkAclResponseType object =
+                new CreateNetworkAclResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateNetworkAclResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateNetworkAclResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkAcl").equals(reader.getName())){
+                                
+                                                object.setNetworkAcl(com.amazon.ec2.NetworkAclType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
new file mode 100644
index 0000000..f414102
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
@@ -0,0 +1,483 @@
+
+/**
+ * CreateNetworkAclType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkAclType bean class
+            */
+        
+        public  class CreateNetworkAclType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateNetworkAclType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for VpcId
+                        */
+
+                        
+                                    protected java.lang.String localVpcId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getVpcId(){
+                               return localVpcId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param VpcId
+                               */
+                               public void setVpcId(java.lang.String param){
+                            
+                                            this.localVpcId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkAclType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateNetworkAclType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateNetworkAclType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"vpcId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"vpcId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("vpcId");
+                                    }
+                                
+
+                                          if (localVpcId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("vpcId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localVpcId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "vpcId"));
+                                 
+                                        if (localVpcId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVpcId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("vpcId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkAclType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkAclType object =
+                new CreateNetworkAclType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateNetworkAclType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateNetworkAclType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpcId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setVpcId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
new file mode 100644
index 0000000..b41e2fc
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateNetworkInterface.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkInterface bean class
+            */
+        
+        public  class CreateNetworkInterface
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateNetworkInterface",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateNetworkInterface
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateNetworkInterfaceType localCreateNetworkInterface ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateNetworkInterfaceType
+                           */
+                           public  com.amazon.ec2.CreateNetworkInterfaceType getCreateNetworkInterface(){
+                               return localCreateNetworkInterface;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateNetworkInterface
+                               */
+                               public void setCreateNetworkInterface(com.amazon.ec2.CreateNetworkInterfaceType param){
+                            
+                                            this.localCreateNetworkInterface=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkInterface.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateNetworkInterface==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateNetworkInterface.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateNetworkInterface.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkInterface parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkInterface object =
+                new CreateNetworkInterface();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateNetworkInterface").equals(reader.getName())){
+                                
+                                                object.setCreateNetworkInterface(com.amazon.ec2.CreateNetworkInterfaceType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
new file mode 100644
index 0000000..ff5f649
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateNetworkInterfaceResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkInterfaceResponse bean class
+            */
+        
+        public  class CreateNetworkInterfaceResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateNetworkInterfaceResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateNetworkInterfaceResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateNetworkInterfaceResponseType localCreateNetworkInterfaceResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateNetworkInterfaceResponseType
+                           */
+                           public  com.amazon.ec2.CreateNetworkInterfaceResponseType getCreateNetworkInterfaceResponse(){
+                               return localCreateNetworkInterfaceResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateNetworkInterfaceResponse
+                               */
+                               public void setCreateNetworkInterfaceResponse(com.amazon.ec2.CreateNetworkInterfaceResponseType param){
+                            
+                                            this.localCreateNetworkInterfaceResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkInterfaceResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateNetworkInterfaceResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateNetworkInterfaceResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateNetworkInterfaceResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkInterfaceResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkInterfaceResponse object =
+                new CreateNetworkInterfaceResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateNetworkInterfaceResponse").equals(reader.getName())){
+                                
+                                                object.setCreateNetworkInterfaceResponse(com.amazon.ec2.CreateNetworkInterfaceResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[61/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java b/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java
index dcd804c..0e47db4 100644
--- a/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java
+++ b/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportKeyPairResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java
index ee236d6..082f960 100644
--- a/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportKeyPairResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportKeyPairType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPairType.java b/awsapi/src/com/amazon/ec2/ImportKeyPairType.java
index a246477..a149fc7 100644
--- a/awsapi/src/com/amazon/ec2/ImportKeyPairType.java
+++ b/awsapi/src/com/amazon/ec2/ImportKeyPairType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportKeyPairType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportVolume.java b/awsapi/src/com/amazon/ec2/ImportVolume.java
index 346a3e3..a84cf28 100644
--- a/awsapi/src/com/amazon/ec2/ImportVolume.java
+++ b/awsapi/src/com/amazon/ec2/ImportVolume.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportVolume.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java b/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java
index 904a17a..65992f3 100644
--- a/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportVolumeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java b/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java
index e147fb9..2da8105 100644
--- a/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportVolumeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java b/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java
index f0826fa..7a06fca 100644
--- a/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java
+++ b/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportVolumeTaskDetailsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ImportVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeType.java b/awsapi/src/com/amazon/ec2/ImportVolumeType.java
index 04f6358..2316c2d 100644
--- a/awsapi/src/com/amazon/ec2/ImportVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/ImportVolumeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ImportVolumeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java
index 630a5cd..dfcd2f6 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceBlockDeviceMappingItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java
index d2992c6..ce9e432 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceBlockDeviceMappingItemTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java
index f132370..68bb7ae 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceBlockDeviceMappingResponseItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java
index 23be62f..e35d0e1 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java
index 7432135..d602f13 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceBlockDeviceMappingResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java
index 0a64672..800ae67 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceBlockDeviceMappingType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java
index f276086..11d0fe0 100644
--- a/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceCountsSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java b/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java
index d98cb18..bba6259 100644
--- a/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceCountsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java b/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java
index 40e0ea9..c729fab 100644
--- a/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceEbsBlockDeviceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java
index 6431736..76913ea 100644
--- a/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceExportTaskResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceIdSetType.java b/awsapi/src/com/amazon/ec2/InstanceIdSetType.java
index d47987d..3957c0b 100644
--- a/awsapi/src/com/amazon/ec2/InstanceIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceIdType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceIdType.java b/awsapi/src/com/amazon/ec2/InstanceIdType.java
index 1792bc2..cbdf11d 100644
--- a/awsapi/src/com/amazon/ec2/InstanceIdType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceIdType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceIdType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java b/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java
index 670a412..83a54b5 100644
--- a/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceLicenseRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java b/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java
index 6f94e39..222a1bc 100644
--- a/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceLicenseResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java b/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java
index 8a568e7..4557a93 100644
--- a/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceMonitoringStateType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java
index 5d06dec..cb5c264 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceNetworkInterfaceAssociationType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java
index 065b4df..21b6e36 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceNetworkInterfaceAttachmentType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java
index 6925f04..1574615 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceNetworkInterfaceSetItemRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java
index 162096c..1f58211 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceNetworkInterfaceSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java
index 48c4ad0..ddd60fd 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceNetworkInterfaceSetRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java
index 76b2479..a1be118 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceNetworkInterfaceSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstancePlacementType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstancePlacementType.java b/awsapi/src/com/amazon/ec2/InstancePlacementType.java
index 33a8a86..6e755d4 100644
--- a/awsapi/src/com/amazon/ec2/InstancePlacementType.java
+++ b/awsapi/src/com/amazon/ec2/InstancePlacementType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstancePlacementType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java
index 6a51179..221a80f 100644
--- a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstancePrivateIpAddressesSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java
index 809de51..88f6c44 100644
--- a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstancePrivateIpAddressesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java b/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java
index e0a7e75..f374faf 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceStateChangeSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java b/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java
index 64b410b..e198adf 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceStateChangeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceStateType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStateType.java b/awsapi/src/com/amazon/ec2/InstanceStateType.java
index 5e793b9..0a99f40 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStateType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStateType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceStateType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java
index 376e770..7edbe96 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceStatusDetailsSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java
index 9f31e8d..91b7013 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceStatusDetailsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java b/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java
index 4bb1cf2..6ae85d0 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceStatusEventType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java b/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java
index d1d0a83..60aea82 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceStatusEventsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java b/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java
index 29d4394..a085784 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceStatusItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java b/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java
index 2e9236c..56a2e98 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceStatusSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceStatusType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusType.java b/awsapi/src/com/amazon/ec2/InstanceStatusType.java
index 15e2e67..30a80a3 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceStatusType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java
index 1c7382d..1ab49d8 100644
--- a/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceTypeSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java b/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java
index f23334b..c9bded2 100644
--- a/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InstanceTypeSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java
index 0b17fee..b9fc9b6 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InternetGatewayAttachmentSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java
index db44380..a6a6f56 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InternetGatewayAttachmentType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java
index 560c6e8..6a6bfba 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InternetGatewayIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java
index ab28da7..a22c077 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InternetGatewayIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java b/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java
index 5b09aa2..f9221c0 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InternetGatewaySetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/InternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayType.java b/awsapi/src/com/amazon/ec2/InternetGatewayType.java
index 6315313..587fa09 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * InternetGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/IpPermissionSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IpPermissionSetType.java b/awsapi/src/com/amazon/ec2/IpPermissionSetType.java
index 2266ce6..2095365 100644
--- a/awsapi/src/com/amazon/ec2/IpPermissionSetType.java
+++ b/awsapi/src/com/amazon/ec2/IpPermissionSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * IpPermissionSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/IpPermissionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IpPermissionType.java b/awsapi/src/com/amazon/ec2/IpPermissionType.java
index a0f705a..b8d09ec 100644
--- a/awsapi/src/com/amazon/ec2/IpPermissionType.java
+++ b/awsapi/src/com/amazon/ec2/IpPermissionType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * IpPermissionType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/IpRangeItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IpRangeItemType.java b/awsapi/src/com/amazon/ec2/IpRangeItemType.java
index 13fbe07..d26c5a7 100644
--- a/awsapi/src/com/amazon/ec2/IpRangeItemType.java
+++ b/awsapi/src/com/amazon/ec2/IpRangeItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * IpRangeItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/IpRangeSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IpRangeSetType.java b/awsapi/src/com/amazon/ec2/IpRangeSetType.java
index 19a9c3a..ed375ad 100644
--- a/awsapi/src/com/amazon/ec2/IpRangeSetType.java
+++ b/awsapi/src/com/amazon/ec2/IpRangeSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * IpRangeSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java b/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java
index 83c5342..9b9e14f 100644
--- a/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java
+++ b/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LaunchPermissionItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java b/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java
index 964b665..9932467 100644
--- a/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java
+++ b/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LaunchPermissionListType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java b/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java
index 60d4e2e..2d5d3ad 100644
--- a/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java
+++ b/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LaunchPermissionOperationType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java b/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java
index 7f4d419..92ae09b 100644
--- a/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java
+++ b/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LaunchSpecificationRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java b/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java
index 4e4472a..688b282 100644
--- a/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java
+++ b/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LaunchSpecificationResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java b/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java
index 1bfd6b7..a2ba310 100644
--- a/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LicenseCapacitySetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java b/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java
index 1547ae5..d4e1fb6 100644
--- a/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LicenseCapacitySetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java b/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java
index dfaebe8..b72ca4f 100644
--- a/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LicenseIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LicenseIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseIdSetType.java b/awsapi/src/com/amazon/ec2/LicenseIdSetType.java
index 7ce8ae3..7fd595c 100644
--- a/awsapi/src/com/amazon/ec2/LicenseIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LicenseIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LicenseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseSetItemType.java b/awsapi/src/com/amazon/ec2/LicenseSetItemType.java
index 35f5e19..27ca248 100644
--- a/awsapi/src/com/amazon/ec2/LicenseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LicenseSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/LicenseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseSetType.java b/awsapi/src/com/amazon/ec2/LicenseSetType.java
index d06aa7e..bd1acf2 100644
--- a/awsapi/src/com/amazon/ec2/LicenseSetType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * LicenseSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java b/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java
index d59ebd7..1777655 100644
--- a/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ModifyImageAttribute.java


[13/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
index 7c5f120..ab1a34b 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteDhcpOptions.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteDhcpOptions",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteDhcpOptions").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteDhcpOptions").equals(reader.getName())){
                                 
                                                 object.setDeleteDhcpOptions(com.amazon.ec2.DeleteDhcpOptionsType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
index ea981c4..88bd5b7 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteDhcpOptionsResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteDhcpOptionsResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteDhcpOptionsResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteDhcpOptionsResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteDhcpOptionsResponse(com.amazon.ec2.DeleteDhcpOptionsResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
index 2a5b100..0fb5451 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteDhcpOptionsResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteDhcpOptionsResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteDhcpOptionsResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
index 4659d05..bbd1366 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteDhcpOptionsType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteDhcpOptionsType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteDhcpOptionsType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "dhcpOptionsId"));
                                  
                                         if (localDhcpOptionsId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","dhcpOptionsId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","dhcpOptionsId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java b/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
new file mode 100644
index 0000000..480ebbd
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteInternetGateway.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteInternetGateway bean class
+            */
+        
+        public  class DeleteInternetGateway
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteInternetGateway",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteInternetGateway
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteInternetGatewayType localDeleteInternetGateway ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteInternetGatewayType
+                           */
+                           public  com.amazon.ec2.DeleteInternetGatewayType getDeleteInternetGateway(){
+                               return localDeleteInternetGateway;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteInternetGateway
+                               */
+                               public void setDeleteInternetGateway(com.amazon.ec2.DeleteInternetGatewayType param){
+                            
+                                            this.localDeleteInternetGateway=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteInternetGateway.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteInternetGateway==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteInternetGateway.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteInternetGateway.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteInternetGateway parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteInternetGateway object =
+                new DeleteInternetGateway();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteInternetGateway").equals(reader.getName())){
+                                
+                                                object.setDeleteInternetGateway(com.amazon.ec2.DeleteInternetGatewayType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
new file mode 100644
index 0000000..05a5742
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteInternetGatewayResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteInternetGatewayResponse bean class
+            */
+        
+        public  class DeleteInternetGatewayResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteInternetGatewayResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteInternetGatewayResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteInternetGatewayResponseType localDeleteInternetGatewayResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteInternetGatewayResponseType
+                           */
+                           public  com.amazon.ec2.DeleteInternetGatewayResponseType getDeleteInternetGatewayResponse(){
+                               return localDeleteInternetGatewayResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteInternetGatewayResponse
+                               */
+                               public void setDeleteInternetGatewayResponse(com.amazon.ec2.DeleteInternetGatewayResponseType param){
+                            
+                                            this.localDeleteInternetGatewayResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteInternetGatewayResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteInternetGatewayResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteInternetGatewayResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteInternetGatewayResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteInternetGatewayResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteInternetGatewayResponse object =
+                new DeleteInternetGatewayResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteInternetGatewayResponse").equals(reader.getName())){
+                                
+                                                object.setDeleteInternetGatewayResponse(com.amazon.ec2.DeleteInternetGatewayResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
new file mode 100644
index 0000000..6ae95d0
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * DeleteInternetGatewayResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteInternetGatewayResponseType bean class
+            */
+        
+        public  class DeleteInternetGatewayResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteInternetGatewayResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteInternetGatewayResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteInternetGatewayResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteInternetGatewayResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteInternetGatewayResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteInternetGatewayResponseType object =
+                new DeleteInternetGatewayResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteInternetGatewayResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteInternetGatewayResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[36/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
new file mode 100644
index 0000000..289fb81
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * AuthorizeSecurityGroupEgressResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AuthorizeSecurityGroupEgressResponseType bean class
+            */
+        
+        public  class AuthorizeSecurityGroupEgressResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AuthorizeSecurityGroupEgressResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AuthorizeSecurityGroupEgressResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AuthorizeSecurityGroupEgressResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AuthorizeSecurityGroupEgressResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AuthorizeSecurityGroupEgressResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AuthorizeSecurityGroupEgressResponseType object =
+                new AuthorizeSecurityGroupEgressResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AuthorizeSecurityGroupEgressResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AuthorizeSecurityGroupEgressResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
new file mode 100644
index 0000000..23cf27c
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
@@ -0,0 +1,544 @@
+
+/**
+ * AuthorizeSecurityGroupEgressType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AuthorizeSecurityGroupEgressType bean class
+            */
+        
+        public  class AuthorizeSecurityGroupEgressType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AuthorizeSecurityGroupEgressType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for GroupId
+                        */
+
+                        
+                                    protected java.lang.String localGroupId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getGroupId(){
+                               return localGroupId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param GroupId
+                               */
+                               public void setGroupId(java.lang.String param){
+                            
+                                            this.localGroupId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for IpPermissions
+                        */
+
+                        
+                                    protected com.amazon.ec2.IpPermissionSetType localIpPermissions ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.IpPermissionSetType
+                           */
+                           public  com.amazon.ec2.IpPermissionSetType getIpPermissions(){
+                               return localIpPermissions;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param IpPermissions
+                               */
+                               public void setIpPermissions(com.amazon.ec2.IpPermissionSetType param){
+                            
+                                            this.localIpPermissions=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AuthorizeSecurityGroupEgressType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AuthorizeSecurityGroupEgressType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AuthorizeSecurityGroupEgressType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"groupId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"groupId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("groupId");
+                                    }
+                                
+
+                                          if (localGroupId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("groupId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localGroupId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                            if (localIpPermissions==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("ipPermissions cannot be null!!");
+                                            }
+                                           localIpPermissions.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ipPermissions"),
+                                               factory,xmlWriter);
+                                        
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "groupId"));
+                                 
+                                        if (localGroupId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localGroupId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("groupId cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "ipPermissions"));
+                            
+                            
+                                    if (localIpPermissions==null){
+                                         throw new org.apache.axis2.databinding.ADBException("ipPermissions cannot be null!!");
+                                    }
+                                    elementList.add(localIpPermissions);
+                                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AuthorizeSecurityGroupEgressType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AuthorizeSecurityGroupEgressType object =
+                new AuthorizeSecurityGroupEgressType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AuthorizeSecurityGroupEgressType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AuthorizeSecurityGroupEgressType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setGroupId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ipPermissions").equals(reader.getName())){
+                                
+                                                object.setIpPermissions(com.amazon.ec2.IpPermissionSetType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
index 94bc333..b2de2aa 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AuthorizeSecurityGroupIngress.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AuthorizeSecurityGroupIngress",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AuthorizeSecurityGroupIngress").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AuthorizeSecurityGroupIngress").equals(reader.getName())){
                                 
                                                 object.setAuthorizeSecurityGroupIngress(com.amazon.ec2.AuthorizeSecurityGroupIngressType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
index e76ba0c..15923cf 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AuthorizeSecurityGroupIngressResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "AuthorizeSecurityGroupIngressResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","AuthorizeSecurityGroupIngressResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AuthorizeSecurityGroupIngressResponse").equals(reader.getName())){
                                 
                                                 object.setAuthorizeSecurityGroupIngressResponse(com.amazon.ec2.AuthorizeSecurityGroupIngressResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
index 8964fd1..3752315 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AuthorizeSecurityGroupIngressResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AuthorizeSecurityGroupIngressResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AuthorizeSecurityGroupIngressResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
index 7ed7e5e..886c9d6 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AuthorizeSecurityGroupIngressType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AuthorizeSecurityGroupIngressType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -54,6 +38,12 @@
                         
                                     protected java.lang.String localUserId ;
                                 
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localUserIdTracker = false ;
+                           
 
                            /**
                            * Auto generated getter method
@@ -71,6 +61,14 @@
                                */
                                public void setUserId(java.lang.String param){
                             
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localUserIdTracker = true;
+                                       } else {
+                                          localUserIdTracker = false;
+                                              
+                                       }
+                                   
                                             this.localUserId=param;
                                     
 
@@ -78,30 +76,30 @@
                             
 
                         /**
-                        * field for GroupName
+                        * field for AuthorizeSecurityGroupIngressTypeChoice_type0
                         */
 
                         
-                                    protected java.lang.String localGroupName ;
+                                    protected com.amazon.ec2.AuthorizeSecurityGroupIngressTypeChoice_type0 localAuthorizeSecurityGroupIngressTypeChoice_type0 ;
                                 
 
                            /**
                            * Auto generated getter method
-                           * @return java.lang.String
+                           * @return com.amazon.ec2.AuthorizeSecurityGroupIngressTypeChoice_type0
                            */
-                           public  java.lang.String getGroupName(){
-                               return localGroupName;
+                           public  com.amazon.ec2.AuthorizeSecurityGroupIngressTypeChoice_type0 getAuthorizeSecurityGroupIngressTypeChoice_type0(){
+                               return localAuthorizeSecurityGroupIngressTypeChoice_type0;
                            }
 
                            
                         
                             /**
                                * Auto generated setter method
-                               * @param param GroupName
+                               * @param param AuthorizeSecurityGroupIngressTypeChoice_type0
                                */
-                               public void setGroupName(java.lang.String param){
+                               public void setAuthorizeSecurityGroupIngressTypeChoice_type0(com.amazon.ec2.AuthorizeSecurityGroupIngressTypeChoice_type0 param){
                             
-                                            this.localGroupName=param;
+                                            this.localAuthorizeSecurityGroupIngressTypeChoice_type0=param;
                                     
 
                                }
@@ -220,7 +218,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AuthorizeSecurityGroupIngressType",
@@ -233,8 +231,8 @@
 
                
                    }
-               
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                if (localUserIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -267,45 +265,16 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
-                                    if (! namespace.equals("")) {
-                                        prefix = xmlWriter.getPrefix(namespace);
-
-                                        if (prefix == null) {
-                                            prefix = generatePrefix(namespace);
-
-                                            xmlWriter.writeStartElement(prefix,"groupName", namespace);
-                                            xmlWriter.writeNamespace(prefix, namespace);
-                                            xmlWriter.setPrefix(prefix, namespace);
-
-                                        } else {
-                                            xmlWriter.writeStartElement(namespace,"groupName");
-                                        }
-
-                                    } else {
-                                        xmlWriter.writeStartElement("groupName");
-                                    }
-                                
-
-                                          if (localGroupName==null){
-                                              // write the nil attribute
-                                              
-                                                     throw new org.apache.axis2.databinding.ADBException("groupName cannot be null!!");
-                                                  
-                                          }else{
-
+                             }
+                                            if (localAuthorizeSecurityGroupIngressTypeChoice_type0==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("AuthorizeSecurityGroupIngressTypeChoice_type0 cannot be null!!");
+                                            }
+                                           localAuthorizeSecurityGroupIngressTypeChoice_type0.serialize(null,factory,xmlWriter);
                                         
-                                                   xmlWriter.writeCharacters(localGroupName);
-                                            
-                                          }
-                                    
-                                   xmlWriter.writeEndElement();
-                             
                                             if (localIpPermissions==null){
                                                  throw new org.apache.axis2.databinding.ADBException("ipPermissions cannot be null!!");
                                             }
-                                           localIpPermissions.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ipPermissions"),
+                                           localIpPermissions.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ipPermissions"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -469,8 +438,8 @@
                  java.util.ArrayList elementList = new java.util.ArrayList();
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
-                
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                 if (localUserIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "userId"));
                                  
                                         if (localUserId != null){
@@ -478,17 +447,17 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("userId cannot be null!!");
                                         }
-                                    
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
-                                                                      "groupName"));
-                                 
-                                        if (localGroupName != null){
-                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localGroupName));
-                                        } else {
-                                           throw new org.apache.axis2.databinding.ADBException("groupName cannot be null!!");
-                                        }
-                                    
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                    }
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "AuthorizeSecurityGroupIngressTypeChoice_type0"));
+                            
+                            
+                                    if (localAuthorizeSecurityGroupIngressTypeChoice_type0==null){
+                                         throw new org.apache.axis2.databinding.ADBException("AuthorizeSecurityGroupIngressTypeChoice_type0 cannot be null!!");
+                                    }
+                                    elementList.add(localAuthorizeSecurityGroupIngressTypeChoice_type0);
+                                
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "ipPermissions"));
                             
                             
@@ -575,7 +544,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","userId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","userId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -586,34 +555,23 @@
                                     
                               }  // End of if for expected property start element
                                 
-                                else{
-                                    // A start element we are not expecting indicates an invalid parameter was passed
-                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
-                                }
-                            
+                                    else {
+                                        
+                                    }
+                                
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","groupName").equals(reader.getName())){
+                                    if (reader.isStartElement() ){
                                 
-                                    java.lang.String content = reader.getElementText();
-                                    
-                                              object.setGroupName(
-                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
-                                              
-                                        reader.next();
-                                    
+                                                object.setAuthorizeSecurityGroupIngressTypeChoice_type0(com.amazon.ec2.AuthorizeSecurityGroupIngressTypeChoice_type0.Factory.parse(reader));
+                                            
                               }  // End of if for expected property start element
                                 
-                                else{
-                                    // A start element we are not expecting indicates an invalid parameter was passed
-                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
-                                }
-                            
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ipPermissions").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ipPermissions").equals(reader.getName())){
                                 
                                                 object.setIpPermissions(com.amazon.ec2.IpPermissionSetType.Factory.parse(reader));
                                               


[07/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
new file mode 100644
index 0000000..b4003c2
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * DeleteRouteTableResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteRouteTableResponseType bean class
+            */
+        
+        public  class DeleteRouteTableResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteRouteTableResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteRouteTableResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteRouteTableResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteRouteTableResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteRouteTableResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteRouteTableResponseType object =
+                new DeleteRouteTableResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteRouteTableResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteRouteTableResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
new file mode 100644
index 0000000..2202b18
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
@@ -0,0 +1,483 @@
+
+/**
+ * DeleteRouteTableType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteRouteTableType bean class
+            */
+        
+        public  class DeleteRouteTableType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteRouteTableType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RouteTableId
+                        */
+
+                        
+                                    protected java.lang.String localRouteTableId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRouteTableId(){
+                               return localRouteTableId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RouteTableId
+                               */
+                               public void setRouteTableId(java.lang.String param){
+                            
+                                            this.localRouteTableId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteRouteTableType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteRouteTableType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteRouteTableType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"routeTableId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"routeTableId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("routeTableId");
+                                    }
+                                
+
+                                          if (localRouteTableId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("routeTableId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRouteTableId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "routeTableId"));
+                                 
+                                        if (localRouteTableId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRouteTableId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("routeTableId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteRouteTableType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteRouteTableType object =
+                new DeleteRouteTableType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteRouteTableType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteRouteTableType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","routeTableId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRouteTableId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteType.java b/awsapi/src/com/amazon/ec2/DeleteRouteType.java
new file mode 100644
index 0000000..5c3b742
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteType.java
@@ -0,0 +1,575 @@
+
+/**
+ * DeleteRouteType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteRouteType bean class
+            */
+        
+        public  class DeleteRouteType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteRouteType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RouteTableId
+                        */
+
+                        
+                                    protected java.lang.String localRouteTableId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRouteTableId(){
+                               return localRouteTableId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RouteTableId
+                               */
+                               public void setRouteTableId(java.lang.String param){
+                            
+                                            this.localRouteTableId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for DestinationCidrBlock
+                        */
+
+                        
+                                    protected java.lang.String localDestinationCidrBlock ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getDestinationCidrBlock(){
+                               return localDestinationCidrBlock;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DestinationCidrBlock
+                               */
+                               public void setDestinationCidrBlock(java.lang.String param){
+                            
+                                            this.localDestinationCidrBlock=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteRouteType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteRouteType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteRouteType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"routeTableId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"routeTableId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("routeTableId");
+                                    }
+                                
+
+                                          if (localRouteTableId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("routeTableId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRouteTableId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"destinationCidrBlock", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"destinationCidrBlock");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("destinationCidrBlock");
+                                    }
+                                
+
+                                          if (localDestinationCidrBlock==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("destinationCidrBlock cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localDestinationCidrBlock);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "routeTableId"));
+                                 
+                                        if (localRouteTableId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRouteTableId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("routeTableId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "destinationCidrBlock"));
+                                 
+                                        if (localDestinationCidrBlock != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDestinationCidrBlock));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("destinationCidrBlock cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteRouteType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteRouteType object =
+                new DeleteRouteType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteRouteType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteRouteType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","routeTableId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRouteTableId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","destinationCidrBlock").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setDestinationCidrBlock(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
index c382100..94e141b 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSecurityGroup.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteSecurityGroup",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteSecurityGroup").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteSecurityGroup").equals(reader.getName())){
                                 
                                                 object.setDeleteSecurityGroup(com.amazon.ec2.DeleteSecurityGroupType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
index 4e8852b..ac65079 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSecurityGroupResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteSecurityGroupResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteSecurityGroupResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteSecurityGroupResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteSecurityGroupResponse(com.amazon.ec2.DeleteSecurityGroupResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
index 3bd3d0c..551ddcd 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteSecurityGroupResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteSecurityGroupResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteSecurityGroupResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     


[14/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
index 0d3e40e..e10b761 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpnGatewayResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateVpnGatewayResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateVpnGatewayResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateVpnGatewayResponse").equals(reader.getName())){
                                 
                                                 object.setCreateVpnGatewayResponse(com.amazon.ec2.CreateVpnGatewayResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
index 290aff4..30df2c7 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpnGatewayResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVpnGatewayResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVpnGatewayResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localVpnGateway==null){
                                                  throw new org.apache.axis2.databinding.ADBException("vpnGateway cannot be null!!");
                                             }
-                                           localVpnGateway.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpnGateway"),
+                                           localVpnGateway.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpnGateway"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpnGateway"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpnGateway").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpnGateway").equals(reader.getName())){
                                 
                                                 object.setVpnGateway(com.amazon.ec2.VpnGatewayType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
index e9988d2..b03538b 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpnGatewayType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVpnGatewayType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -204,7 +188,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVpnGatewayType",
@@ -218,7 +202,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -252,7 +236,7 @@
                                     
                                    xmlWriter.writeEndElement();
                               if (localAvailabilityZoneTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -448,7 +432,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "type"));
                                  
                                         if (localType != null){
@@ -457,7 +441,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("type cannot be null!!");
                                         }
                                      if (localAvailabilityZoneTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "availabilityZone"));
                                  
                                         if (localAvailabilityZone != null){
@@ -544,7 +528,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","type").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","type").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -563,7 +547,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","availabilityZone").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","availabilityZone").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
index ac3c015..b2de817 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CustomerGatewayIdSetItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CustomerGatewayIdSetItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CustomerGatewayIdSetItemType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "customerGatewayId"));
                                  
                                         if (localCustomerGatewayId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","customerGatewayId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","customerGatewayId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
index e8ea4fc..9b0c23b 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CustomerGatewayIdSetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CustomerGatewayIdSetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CustomerGatewayIdSetType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.CustomerGatewayIdSetItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java b/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
index a3dfef5..be2efeb 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CustomerGatewaySetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CustomerGatewaySetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CustomerGatewaySetType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.CustomerGatewayType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
index 45de172..30f2e4e 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CustomerGatewayType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CustomerGatewayType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -174,6 +158,12 @@
                         
                                     protected int localBgpAsn ;
                                 
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localBgpAsnTracker = false ;
+                           
 
                            /**
                            * Auto generated getter method
@@ -191,6 +181,15 @@
                                */
                                public void setBgpAsn(int param){
                             
+                                       // setting primitive attribute tracker to true
+                                       
+                                               if (param==java.lang.Integer.MIN_VALUE) {
+                                           localBgpAsnTracker = false;
+                                              
+                                       } else {
+                                          localBgpAsnTracker = true;
+                                       }
+                                   
                                             this.localBgpAsn=param;
                                     
 
@@ -324,7 +323,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CustomerGatewayType",
@@ -338,7 +337,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -372,7 +371,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -406,7 +405,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -440,7 +439,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -473,8 +472,8 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                              if (localBgpAsnTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -502,11 +501,11 @@
                                                }
                                     
                                    xmlWriter.writeEndElement();
-                              if (localTagSetTracker){
+                             } if (localTagSetTracker){
                                             if (localTagSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("tagSet cannot be null!!");
                                             }
-                                           localTagSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","tagSet"),
+                                           localTagSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","tagSet"),
                                                factory,xmlWriter);
                                         }
                     xmlWriter.writeEndElement();
@@ -671,7 +670,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "customerGatewayId"));
                                  
                                         if (localCustomerGatewayId != null){
@@ -680,7 +679,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("customerGatewayId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "state"));
                                  
                                         if (localState != null){
@@ -689,7 +688,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("state cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "type"));
                                  
                                         if (localType != null){
@@ -698,7 +697,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("type cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "ipAddress"));
                                  
                                         if (localIpAddress != null){
@@ -706,14 +705,14 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("ipAddress cannot be null!!");
                                         }
-                                    
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                     if (localBgpAsnTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bgpAsn"));
                                  
                                 elementList.add(
                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localBgpAsn));
-                             if (localTagSetTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            } if (localTagSetTracker){
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "tagSet"));
                             
                             
@@ -800,7 +799,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","customerGatewayId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","customerGatewayId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -819,7 +818,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","state").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","state").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -838,7 +837,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","type").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","type").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -857,7 +856,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ipAddress").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ipAddress").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -876,7 +875,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bgpAsn").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bgpAsn").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -887,15 +886,16 @@
                                     
                               }  // End of if for expected property start element
                                 
-                                else{
-                                    // A start element we are not expecting indicates an invalid parameter was passed
-                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
-                                }
-                            
+                                    else {
+                                        
+                                               object.setBgpAsn(java.lang.Integer.MIN_VALUE);
+                                           
+                                    }
+                                
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","tagSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","tagSet").equals(reader.getName())){
                                 
                                                 object.setTagSet(com.amazon.ec2.ResourceTagSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeactivateLicense.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicense.java b/awsapi/src/com/amazon/ec2/DeactivateLicense.java
index 89c967f..5904552 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicense.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicense.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeactivateLicense.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeactivateLicense",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeactivateLicense").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeactivateLicense").equals(reader.getName())){
                                 
                                                 object.setDeactivateLicense(com.amazon.ec2.DeactivateLicenseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
index 8df5b4c..fefa475 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeactivateLicenseResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeactivateLicenseResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeactivateLicenseResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeactivateLicenseResponse").equals(reader.getName())){
                                 
                                                 object.setDeactivateLicenseResponse(com.amazon.ec2.DeactivateLicenseResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
index f2ffa68..7daff81 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeactivateLicenseResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeactivateLicenseResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeactivateLicenseResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
index 8b58bc0..607558a 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeactivateLicenseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeactivateLicenseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeactivateLicenseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "licenseId"));
                                  
                                         if (localLicenseId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("licenseId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "capacity"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","licenseId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","licenseId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","capacity").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","capacity").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
index b84e098..0e4fe35 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteCustomerGateway.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteCustomerGateway",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteCustomerGateway").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteCustomerGateway").equals(reader.getName())){
                                 
                                                 object.setDeleteCustomerGateway(com.amazon.ec2.DeleteCustomerGatewayType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
index 790c490..83c3985 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteCustomerGatewayResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DeleteCustomerGatewayResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DeleteCustomerGatewayResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteCustomerGatewayResponse").equals(reader.getName())){
                                 
                                                 object.setDeleteCustomerGatewayResponse(com.amazon.ec2.DeleteCustomerGatewayResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
index 0d0c893..f8232e1 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteCustomerGatewayResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteCustomerGatewayResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteCustomerGatewayResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
index 5e1fec8..58f4b05 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DeleteCustomerGatewayType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DeleteCustomerGatewayType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DeleteCustomerGatewayType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "customerGatewayId"));
                                  
                                         if (localCustomerGatewayId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","customerGatewayId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","customerGatewayId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     


[71/71] [abbrv] git commit: updated refs/heads/master to 26af71b

Posted by li...@apache.org.
CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files
[Support for EC2 API version 2012-08-15]


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26af71b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26af71b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26af71b2

Branch: refs/heads/master
Commit: 26af71b23bc3b2f028d6a0040709903d14e5a97d
Parents: d908f85
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Jul 4 11:11:21 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Jul 4 11:11:21 2013 +0530

----------------------------------------------------------------------
 awsapi/src/com/amazon/ec2/ActivateLicense.java      | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ActivateLicenseResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/ActivateLicenseResponseType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ActivateLicenseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AllocateAddress.java      | 16 ++++++++++++++++
 .../src/com/amazon/ec2/AllocateAddressResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/AllocateAddressResponseType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AllocateAddressType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/AllocationIdSetItemType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AllocationIdSetType.java  | 16 ++++++++++++++++
 .../amazon/ec2/AmazonEC2MessageReceiverInOut.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/AmazonEC2SkeletonInterface.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/AssignPrivateIpAddresses.java    | 16 ++++++++++++++++
 .../ec2/AssignPrivateIpAddressesResponse.java       | 16 ++++++++++++++++
 .../ec2/AssignPrivateIpAddressesResponseType.java   | 16 ++++++++++++++++
 .../AssignPrivateIpAddressesSetItemRequestType.java | 16 ++++++++++++++++
 .../ec2/AssignPrivateIpAddressesSetRequestType.java | 16 ++++++++++++++++
 .../amazon/ec2/AssignPrivateIpAddressesType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AssociateAddress.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/AssociateAddressResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/AssociateAddressResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AssociateAddressType.java | 16 ++++++++++++++++
 .../ec2/AssociateAddressTypeChoice_type0.java       | 16 ++++++++++++++++
 .../ec2/AssociateAddressTypeChoice_type1.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java | 16 ++++++++++++++++
 .../amazon/ec2/AssociateDhcpOptionsResponse.java    | 16 ++++++++++++++++
 .../ec2/AssociateDhcpOptionsResponseType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/AssociateDhcpOptionsType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AssociateRouteTable.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/AssociateRouteTableResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/AssociateRouteTableResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/AssociateRouteTableType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/AttachInternetGateway.java   | 16 ++++++++++++++++
 .../amazon/ec2/AttachInternetGatewayResponse.java   | 16 ++++++++++++++++
 .../ec2/AttachInternetGatewayResponseType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/AttachInternetGatewayType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/AttachNetworkInterface.java  | 16 ++++++++++++++++
 .../amazon/ec2/AttachNetworkInterfaceResponse.java  | 16 ++++++++++++++++
 .../ec2/AttachNetworkInterfaceResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/AttachNetworkInterfaceType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AttachVolume.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AttachVolumeResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/AttachVolumeResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AttachVolumeType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AttachVpnGateway.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/AttachVpnGatewayResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/AttachVpnGatewayResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java | 16 ++++++++++++++++
 .../amazon/ec2/AttachmentSetItemResponseType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/AttachmentSetResponseType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AttachmentSetType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AttachmentType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/AttributeBooleanValueType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/AttributeValueType.java   | 16 ++++++++++++++++
 .../amazon/ec2/AuthorizeSecurityGroupEgress.java    | 16 ++++++++++++++++
 .../ec2/AuthorizeSecurityGroupEgressResponse.java   | 16 ++++++++++++++++
 .../AuthorizeSecurityGroupEgressResponseType.java   | 16 ++++++++++++++++
 .../ec2/AuthorizeSecurityGroupEgressType.java       | 16 ++++++++++++++++
 .../amazon/ec2/AuthorizeSecurityGroupIngress.java   | 16 ++++++++++++++++
 .../ec2/AuthorizeSecurityGroupIngressResponse.java  | 16 ++++++++++++++++
 .../AuthorizeSecurityGroupIngressResponseType.java  | 16 ++++++++++++++++
 .../ec2/AuthorizeSecurityGroupIngressType.java      | 16 ++++++++++++++++
 ...thorizeSecurityGroupIngressTypeChoice_type0.java | 16 ++++++++++++++++
 .../com/amazon/ec2/AvailabilityZoneItemType.java    | 16 ++++++++++++++++
 .../amazon/ec2/AvailabilityZoneMessageSetType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/AvailabilityZoneMessageType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/AvailabilityZoneSetType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/BlockDeviceMappingItemType.java  | 16 ++++++++++++++++
 .../ec2/BlockDeviceMappingItemTypeChoice_type0.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/BlockDeviceMappingType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/BundleInstance.java       | 16 ++++++++++++++++
 .../src/com/amazon/ec2/BundleInstanceResponse.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/BundleInstanceResponseType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/BundleInstanceS3StorageType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/BundleInstanceTaskErrorType.java | 16 ++++++++++++++++
 .../amazon/ec2/BundleInstanceTaskStorageType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/BundleInstanceTaskType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/BundleInstanceTasksSetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/BundleInstanceType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CancelBundleTask.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/CancelBundleTaskResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/CancelBundleTaskResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CancelBundleTaskType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CancelConversionTask.java | 16 ++++++++++++++++
 .../amazon/ec2/CancelConversionTaskResponse.java    | 16 ++++++++++++++++
 .../ec2/CancelConversionTaskResponseType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/CancelConversionTaskType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CancelExportTask.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/CancelExportTaskResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/CancelExportTaskResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CancelExportTaskType.java | 16 ++++++++++++++++
 .../amazon/ec2/CancelReservedInstancesListing.java  | 16 ++++++++++++++++
 .../ec2/CancelReservedInstancesListingResponse.java | 16 ++++++++++++++++
 .../CancelReservedInstancesListingResponseType.java | 16 ++++++++++++++++
 .../ec2/CancelReservedInstancesListingType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/CancelSpotInstanceRequests.java  | 16 ++++++++++++++++
 .../ec2/CancelSpotInstanceRequestsResponse.java     | 16 ++++++++++++++++
 ...ncelSpotInstanceRequestsResponseSetItemType.java | 16 ++++++++++++++++
 .../CancelSpotInstanceRequestsResponseSetType.java  | 16 ++++++++++++++++
 .../ec2/CancelSpotInstanceRequestsResponseType.java | 16 ++++++++++++++++
 .../amazon/ec2/CancelSpotInstanceRequestsType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ConfirmProductInstance.java  | 16 ++++++++++++++++
 .../amazon/ec2/ConfirmProductInstanceResponse.java  | 16 ++++++++++++++++
 .../ec2/ConfirmProductInstanceResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/ConfirmProductInstanceType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/ConversionTaskIdItemType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ConversionTaskIdSetType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ConversionTaskSetType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ConversionTaskType.java   | 16 ++++++++++++++++
 .../amazon/ec2/ConversionTaskTypeChoice_type0.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateCustomerGateway.java   | 16 ++++++++++++++++
 .../amazon/ec2/CreateCustomerGatewayResponse.java   | 16 ++++++++++++++++
 .../ec2/CreateCustomerGatewayResponseType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateCustomerGatewayType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateDhcpOptions.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateDhcpOptionsResponse.java   | 16 ++++++++++++++++
 .../amazon/ec2/CreateDhcpOptionsResponseType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateDhcpOptionsType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateImage.java          | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateImageResponse.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateImageResponseType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateImageType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateInstanceExportTask.java    | 16 ++++++++++++++++
 .../ec2/CreateInstanceExportTaskResponse.java       | 16 ++++++++++++++++
 .../ec2/CreateInstanceExportTaskResponseType.java   | 16 ++++++++++++++++
 .../amazon/ec2/CreateInstanceExportTaskType.java    | 16 ++++++++++++++++
 .../CreateInstanceExportTaskTypeChoice_type0.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateInternetGateway.java   | 16 ++++++++++++++++
 .../amazon/ec2/CreateInternetGatewayResponse.java   | 16 ++++++++++++++++
 .../ec2/CreateInternetGatewayResponseType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateInternetGatewayType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateKeyPair.java        | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateKeyPairResponse.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateKeyPairResponseType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateKeyPairType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateNetworkAcl.java     | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateNetworkAclEntry.java   | 16 ++++++++++++++++
 .../amazon/ec2/CreateNetworkAclEntryResponse.java   | 16 ++++++++++++++++
 .../ec2/CreateNetworkAclEntryResponseType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateNetworkAclEntryType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateNetworkAclResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/CreateNetworkAclResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateNetworkAclType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateNetworkInterface.java  | 16 ++++++++++++++++
 .../amazon/ec2/CreateNetworkInterfaceResponse.java  | 16 ++++++++++++++++
 .../ec2/CreateNetworkInterfaceResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateNetworkInterfaceType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreatePlacementGroup.java | 16 ++++++++++++++++
 .../amazon/ec2/CreatePlacementGroupResponse.java    | 16 ++++++++++++++++
 .../ec2/CreatePlacementGroupResponseType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/CreatePlacementGroupType.java    | 16 ++++++++++++++++
 .../amazon/ec2/CreateReservedInstancesListing.java  | 16 ++++++++++++++++
 .../ec2/CreateReservedInstancesListingResponse.java | 16 ++++++++++++++++
 .../CreateReservedInstancesListingResponseType.java | 16 ++++++++++++++++
 .../ec2/CreateReservedInstancesListingType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateRoute.java          | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateRouteResponse.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateRouteResponseType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateRouteTable.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateRouteTableResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/CreateRouteTableResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateRouteTableType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateRouteType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateRouteTypeChoice_type0.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateSecurityGroup.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateSecurityGroupResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/CreateSecurityGroupResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateSecurityGroupType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateSnapshot.java       | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateSnapshotResponse.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateSnapshotResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateSnapshotType.java   | 16 ++++++++++++++++
 .../amazon/ec2/CreateSpotDatafeedSubscription.java  | 16 ++++++++++++++++
 .../ec2/CreateSpotDatafeedSubscriptionResponse.java | 16 ++++++++++++++++
 .../CreateSpotDatafeedSubscriptionResponseType.java | 16 ++++++++++++++++
 .../ec2/CreateSpotDatafeedSubscriptionType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateSubnet.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateSubnetResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateSubnetResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateSubnetType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateTags.java           | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateTagsResponse.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateTagsResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateTagsType.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateVolume.java         | 16 ++++++++++++++++
 .../amazon/ec2/CreateVolumePermissionItemType.java  | 16 ++++++++++++++++
 .../amazon/ec2/CreateVolumePermissionListType.java  | 16 ++++++++++++++++
 .../ec2/CreateVolumePermissionOperationType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateVolumeResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateVolumeResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateVolumeType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateVpc.java            | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateVpcResponse.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateVpcResponseType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateVpcType.java        | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateVpnConnection.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateVpnConnectionResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/CreateVpnConnectionResponseType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateVpnConnectionRoute.java    | 16 ++++++++++++++++
 .../ec2/CreateVpnConnectionRouteResponse.java       | 16 ++++++++++++++++
 .../ec2/CreateVpnConnectionRouteResponseType.java   | 16 ++++++++++++++++
 .../amazon/ec2/CreateVpnConnectionRouteType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CreateVpnConnectionType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateVpnGateway.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/CreateVpnGatewayResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/CreateVpnGatewayResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java | 16 ++++++++++++++++
 .../amazon/ec2/CustomerGatewayIdSetItemType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/CustomerGatewayIdSetType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/CustomerGatewaySetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/CustomerGatewayType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeactivateLicense.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DeactivateLicenseResponse.java   | 16 ++++++++++++++++
 .../amazon/ec2/DeactivateLicenseResponseType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeactivateLicenseType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteCustomerGateway.java   | 16 ++++++++++++++++
 .../amazon/ec2/DeleteCustomerGatewayResponse.java   | 16 ++++++++++++++++
 .../ec2/DeleteCustomerGatewayResponseType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteCustomerGatewayType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteDhcpOptionsResponse.java   | 16 ++++++++++++++++
 .../amazon/ec2/DeleteDhcpOptionsResponseType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteDhcpOptionsType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteInternetGateway.java   | 16 ++++++++++++++++
 .../amazon/ec2/DeleteInternetGatewayResponse.java   | 16 ++++++++++++++++
 .../ec2/DeleteInternetGatewayResponseType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteInternetGatewayType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteKeyPair.java        | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteKeyPairResponse.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteKeyPairResponseType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteKeyPairType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java     | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteNetworkAclEntry.java   | 16 ++++++++++++++++
 .../amazon/ec2/DeleteNetworkAclEntryResponse.java   | 16 ++++++++++++++++
 .../ec2/DeleteNetworkAclEntryResponseType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteNetworkAclEntryType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteNetworkAclResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/DeleteNetworkAclResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteNetworkInterface.java  | 16 ++++++++++++++++
 .../amazon/ec2/DeleteNetworkInterfaceResponse.java  | 16 ++++++++++++++++
 .../ec2/DeleteNetworkInterfaceResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteNetworkInterfaceType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeletePlacementGroup.java | 16 ++++++++++++++++
 .../amazon/ec2/DeletePlacementGroupResponse.java    | 16 ++++++++++++++++
 .../ec2/DeletePlacementGroupResponseType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/DeletePlacementGroupType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteRoute.java          | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteRouteResponse.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteRouteResponseType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteRouteTable.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteRouteTableResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/DeleteRouteTableResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteRouteTableType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteRouteType.java      | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteSecurityGroupResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/DeleteSecurityGroupResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteSecurityGroupType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteSnapshot.java       | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteSnapshotResponse.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteSnapshotResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteSnapshotType.java   | 16 ++++++++++++++++
 .../amazon/ec2/DeleteSpotDatafeedSubscription.java  | 16 ++++++++++++++++
 .../ec2/DeleteSpotDatafeedSubscriptionResponse.java | 16 ++++++++++++++++
 .../DeleteSpotDatafeedSubscriptionResponseType.java | 16 ++++++++++++++++
 .../ec2/DeleteSpotDatafeedSubscriptionType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteSubnet.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteSubnetResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteSubnetType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteTags.java           | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteTagsResponse.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteTagsResponseType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteTagsSetItemType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteTagsSetType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteTagsType.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteVolume.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteVolumeResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteVolumeType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteVpc.java            | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteVpcResponse.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteVpcResponseType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteVpcType.java        | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteVpnConnection.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteVpnConnectionResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/DeleteVpnConnectionResponseType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteVpnConnectionRoute.java    | 16 ++++++++++++++++
 .../ec2/DeleteVpnConnectionRouteResponse.java       | 16 ++++++++++++++++
 .../ec2/DeleteVpnConnectionRouteResponseType.java   | 16 ++++++++++++++++
 .../amazon/ec2/DeleteVpnConnectionRouteType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeleteVpnConnectionType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteVpnGateway.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DeleteVpnGatewayResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/DeleteVpnGatewayResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeregisterImage.java      | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DeregisterImageResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DeregisterImageResponseType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DeregisterImageType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeAddresses.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeAddressesInfoType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeAddressesItemType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeAddressesResponse.java   | 16 ++++++++++++++++
 .../ec2/DescribeAddressesResponseInfoType.java      | 16 ++++++++++++++++
 .../ec2/DescribeAddressesResponseItemType.java      | 16 ++++++++++++++++
 .../amazon/ec2/DescribeAddressesResponseType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeAddressesType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeAvailabilityZones.java   | 16 ++++++++++++++++
 .../ec2/DescribeAvailabilityZonesResponse.java      | 16 ++++++++++++++++
 .../ec2/DescribeAvailabilityZonesResponseType.java  | 16 ++++++++++++++++
 .../ec2/DescribeAvailabilityZonesSetItemType.java   | 16 ++++++++++++++++
 .../ec2/DescribeAvailabilityZonesSetType.java       | 16 ++++++++++++++++
 .../amazon/ec2/DescribeAvailabilityZonesType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeBundleTasks.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeBundleTasksInfoType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeBundleTasksItemType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeBundleTasksResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeBundleTasksResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeBundleTasksType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeConversionTasks.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeConversionTasksResponse.java | 16 ++++++++++++++++
 .../ec2/DescribeConversionTasksResponseType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeConversionTasksType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeCustomerGateways.java    | 16 ++++++++++++++++
 .../ec2/DescribeCustomerGatewaysResponse.java       | 16 ++++++++++++++++
 .../ec2/DescribeCustomerGatewaysResponseType.java   | 16 ++++++++++++++++
 .../amazon/ec2/DescribeCustomerGatewaysType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeDhcpOptionsResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeDhcpOptionsResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeDhcpOptionsType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeExportTasks.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeExportTasksResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeExportTasksResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeExportTasksType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeImageAttribute.java  | 16 ++++++++++++++++
 .../amazon/ec2/DescribeImageAttributeResponse.java  | 16 ++++++++++++++++
 .../ec2/DescribeImageAttributeResponseType.java     | 16 ++++++++++++++++
 ...cribeImageAttributeResponseTypeChoice_type0.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeImageAttributeType.java  | 16 ++++++++++++++++
 .../amazon/ec2/DescribeImageAttributesGroup.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeImages.java       | 16 ++++++++++++++++
 .../ec2/DescribeImagesExecutableBySetType.java      | 16 ++++++++++++++++
 .../amazon/ec2/DescribeImagesExecutableByType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeImagesInfoType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeImagesItemType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeImagesOwnerType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeImagesOwnersType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeImagesResponse.java  | 16 ++++++++++++++++
 .../amazon/ec2/DescribeImagesResponseInfoType.java  | 16 ++++++++++++++++
 .../amazon/ec2/DescribeImagesResponseItemType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeImagesResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeImagesType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeInstanceAttribute.java   | 16 ++++++++++++++++
 .../ec2/DescribeInstanceAttributeResponse.java      | 16 ++++++++++++++++
 .../ec2/DescribeInstanceAttributeResponseType.java  | 16 ++++++++++++++++
 ...beInstanceAttributeResponseTypeChoice_type0.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeInstanceAttributeType.java   | 16 ++++++++++++++++
 .../amazon/ec2/DescribeInstanceAttributesGroup.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeInstanceStatus.java  | 16 ++++++++++++++++
 .../amazon/ec2/DescribeInstanceStatusResponse.java  | 16 ++++++++++++++++
 .../ec2/DescribeInstanceStatusResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeInstanceStatusType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeInstances.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeInstancesInfoType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeInstancesItemType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeInstancesResponse.java   | 16 ++++++++++++++++
 .../amazon/ec2/DescribeInstancesResponseType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeInstancesType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeInternetGateways.java    | 16 ++++++++++++++++
 .../ec2/DescribeInternetGatewaysResponse.java       | 16 ++++++++++++++++
 .../ec2/DescribeInternetGatewaysResponseType.java   | 16 ++++++++++++++++
 .../amazon/ec2/DescribeInternetGatewaysType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeKeyPairs.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeKeyPairsInfoType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeKeyPairsItemType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeKeyPairsResponse.java    | 16 ++++++++++++++++
 .../ec2/DescribeKeyPairsResponseInfoType.java       | 16 ++++++++++++++++
 .../ec2/DescribeKeyPairsResponseItemType.java       | 16 ++++++++++++++++
 .../amazon/ec2/DescribeKeyPairsResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeLicenses.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeLicensesResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/DescribeLicensesResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeLicensesType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeNetworkAclsResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeNetworkAclsResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeNetworkAclsType.java | 16 ++++++++++++++++
 .../ec2/DescribeNetworkInterfaceAttribute.java      | 16 ++++++++++++++++
 .../DescribeNetworkInterfaceAttributeResponse.java  | 16 ++++++++++++++++
 ...scribeNetworkInterfaceAttributeResponseType.java | 16 ++++++++++++++++
 ...kInterfaceAttributeResponseTypeChoice_type0.java | 16 ++++++++++++++++
 .../ec2/DescribeNetworkInterfaceAttributeType.java  | 16 ++++++++++++++++
 .../DescribeNetworkInterfaceAttributesGroup.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeNetworkInterfaces.java   | 16 ++++++++++++++++
 .../ec2/DescribeNetworkInterfacesResponse.java      | 16 ++++++++++++++++
 .../ec2/DescribeNetworkInterfacesResponseType.java  | 16 ++++++++++++++++
 .../amazon/ec2/DescribeNetworkInterfacesType.java   | 16 ++++++++++++++++
 .../amazon/ec2/DescribePlacementGroupItemType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribePlacementGroups.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribePlacementGroupsInfoType.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribePlacementGroupsResponse.java | 16 ++++++++++++++++
 .../ec2/DescribePlacementGroupsResponseType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribePlacementGroupsType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeRegions.java      | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeRegionsResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeRegionsResponseType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeRegionsSetItemType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeRegionsSetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeRegionsType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeReservedInstances.java   | 16 ++++++++++++++++
 ...DescribeReservedInstancesListingSetItemType.java | 16 ++++++++++++++++
 .../DescribeReservedInstancesListingSetType.java    | 16 ++++++++++++++++
 .../ec2/DescribeReservedInstancesListings.java      | 16 ++++++++++++++++
 .../DescribeReservedInstancesListingsResponse.java  | 16 ++++++++++++++++
 ...eservedInstancesListingsResponseSetItemType.java | 16 ++++++++++++++++
 ...ibeReservedInstancesListingsResponseSetType.java | 16 ++++++++++++++++
 ...scribeReservedInstancesListingsResponseType.java | 16 ++++++++++++++++
 .../ec2/DescribeReservedInstancesListingsType.java  | 16 ++++++++++++++++
 .../ec2/DescribeReservedInstancesOfferings.java     | 16 ++++++++++++++++
 .../DescribeReservedInstancesOfferingsResponse.java | 16 ++++++++++++++++
 ...servedInstancesOfferingsResponseSetItemType.java | 16 ++++++++++++++++
 ...beReservedInstancesOfferingsResponseSetType.java | 16 ++++++++++++++++
 ...cribeReservedInstancesOfferingsResponseType.java | 16 ++++++++++++++++
 ...scribeReservedInstancesOfferingsSetItemType.java | 16 ++++++++++++++++
 .../DescribeReservedInstancesOfferingsSetType.java  | 16 ++++++++++++++++
 .../ec2/DescribeReservedInstancesOfferingsType.java | 16 ++++++++++++++++
 .../ec2/DescribeReservedInstancesResponse.java      | 16 ++++++++++++++++
 ...escribeReservedInstancesResponseSetItemType.java | 16 ++++++++++++++++
 .../DescribeReservedInstancesResponseSetType.java   | 16 ++++++++++++++++
 .../ec2/DescribeReservedInstancesResponseType.java  | 16 ++++++++++++++++
 .../ec2/DescribeReservedInstancesSetItemType.java   | 16 ++++++++++++++++
 .../ec2/DescribeReservedInstancesSetType.java       | 16 ++++++++++++++++
 .../amazon/ec2/DescribeReservedInstancesType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeRouteTables.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeRouteTablesResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeRouteTablesResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeRouteTablesType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeSecurityGroups.java  | 16 ++++++++++++++++
 .../ec2/DescribeSecurityGroupsIdSetItemType.java    | 16 ++++++++++++++++
 .../amazon/ec2/DescribeSecurityGroupsIdSetType.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeSecurityGroupsResponse.java  | 16 ++++++++++++++++
 .../ec2/DescribeSecurityGroupsResponseType.java     | 16 ++++++++++++++++
 .../ec2/DescribeSecurityGroupsSetItemType.java      | 16 ++++++++++++++++
 .../amazon/ec2/DescribeSecurityGroupsSetType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeSecurityGroupsType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeSnapshotAttribute.java   | 16 ++++++++++++++++
 .../ec2/DescribeSnapshotAttributeResponse.java      | 16 ++++++++++++++++
 .../ec2/DescribeSnapshotAttributeResponseType.java  | 16 ++++++++++++++++
 ...beSnapshotAttributeResponseTypeChoice_type0.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeSnapshotAttributeType.java   | 16 ++++++++++++++++
 .../amazon/ec2/DescribeSnapshotAttributesGroup.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeSnapshots.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeSnapshotsOwnerType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeSnapshotsOwnersType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeSnapshotsResponse.java   | 16 ++++++++++++++++
 .../amazon/ec2/DescribeSnapshotsResponseType.java   | 16 ++++++++++++++++
 .../ec2/DescribeSnapshotsRestorableBySetType.java   | 16 ++++++++++++++++
 .../ec2/DescribeSnapshotsRestorableByType.java      | 16 ++++++++++++++++
 .../ec2/DescribeSnapshotsSetItemResponseType.java   | 16 ++++++++++++++++
 .../amazon/ec2/DescribeSnapshotsSetItemType.java    | 16 ++++++++++++++++
 .../ec2/DescribeSnapshotsSetResponseType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeSnapshotsSetType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeSnapshotsType.java   | 16 ++++++++++++++++
 .../ec2/DescribeSpotDatafeedSubscription.java       | 16 ++++++++++++++++
 .../DescribeSpotDatafeedSubscriptionResponse.java   | 16 ++++++++++++++++
 ...escribeSpotDatafeedSubscriptionResponseType.java | 16 ++++++++++++++++
 .../ec2/DescribeSpotDatafeedSubscriptionType.java   | 16 ++++++++++++++++
 .../amazon/ec2/DescribeSpotInstanceRequests.java    | 16 ++++++++++++++++
 .../ec2/DescribeSpotInstanceRequestsResponse.java   | 16 ++++++++++++++++
 .../DescribeSpotInstanceRequestsResponseType.java   | 16 ++++++++++++++++
 .../ec2/DescribeSpotInstanceRequestsType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeSpotPriceHistory.java    | 16 ++++++++++++++++
 .../ec2/DescribeSpotPriceHistoryResponse.java       | 16 ++++++++++++++++
 .../ec2/DescribeSpotPriceHistoryResponseType.java   | 16 ++++++++++++++++
 .../amazon/ec2/DescribeSpotPriceHistoryType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeSubnets.java      | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeSubnetsResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeSubnetsResponseType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeSubnetsType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeTags.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeTagsResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeTagsResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeTagsType.java     | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeVolumeAttribute.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeVolumeAttributeResponse.java | 16 ++++++++++++++++
 .../ec2/DescribeVolumeAttributeResponseType.java    | 16 ++++++++++++++++
 ...ribeVolumeAttributeResponseTypeChoice_type0.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeVolumeAttributeType.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeVolumeAttributesGroup.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeVolumeStatusResponse.java    | 16 ++++++++++++++++
 .../ec2/DescribeVolumeStatusResponseType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeVolumeStatusType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeVolumes.java      | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeVolumesResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeVolumesResponseType.java | 16 ++++++++++++++++
 .../ec2/DescribeVolumesSetItemResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeVolumesSetItemType.java  | 16 ++++++++++++++++
 .../amazon/ec2/DescribeVolumesSetResponseType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeVolumesSetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeVolumesType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeVpcs.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeVpcsResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeVpcsType.java     | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeVpnConnections.java  | 16 ++++++++++++++++
 .../amazon/ec2/DescribeVpnConnectionsResponse.java  | 16 ++++++++++++++++
 .../ec2/DescribeVpnConnectionsResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeVpnConnectionsType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DescribeVpnGateways.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DescribeVpnGatewaysResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/DescribeVpnGatewaysResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DescribeVpnGatewaysType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DetachInternetGateway.java   | 16 ++++++++++++++++
 .../amazon/ec2/DetachInternetGatewayResponse.java   | 16 ++++++++++++++++
 .../ec2/DetachInternetGatewayResponseType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/DetachInternetGatewayType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DetachNetworkInterface.java  | 16 ++++++++++++++++
 .../amazon/ec2/DetachNetworkInterfaceResponse.java  | 16 ++++++++++++++++
 .../ec2/DetachNetworkInterfaceResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DetachNetworkInterfaceType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DetachVolume.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DetachVolumeResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/DetachVolumeResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DetachVolumeType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DetachVpnGateway.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DetachVpnGatewayResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/DetachVpnGatewayResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java | 16 ++++++++++++++++
 .../amazon/ec2/DhcpConfigurationItemSetType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/DhcpConfigurationItemType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/DhcpOptionsIdSetItemType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DhcpOptionsType.java      | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DhcpValueSetType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DhcpValueType.java        | 16 ++++++++++++++++
 .../com/amazon/ec2/DisableVgwRoutePropagation.java  | 16 ++++++++++++++++
 .../ec2/DisableVgwRoutePropagationRequestType.java  | 16 ++++++++++++++++
 .../ec2/DisableVgwRoutePropagationResponse.java     | 16 ++++++++++++++++
 .../ec2/DisableVgwRoutePropagationResponseType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DisassociateAddress.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DisassociateAddressResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/DisassociateAddressResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DisassociateAddressType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/DisassociateRouteTable.java  | 16 ++++++++++++++++
 .../amazon/ec2/DisassociateRouteTableResponse.java  | 16 ++++++++++++++++
 .../ec2/DisassociateRouteTableResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/DisassociateRouteTableType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/DiskImageDescriptionType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DiskImageDetailType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DiskImageSetType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DiskImageType.java        | 16 ++++++++++++++++
 .../amazon/ec2/DiskImageVolumeDescriptionType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/DiskImageVolumeType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java   | 16 ++++++++++++++++
 .../EbsInstanceBlockDeviceMappingResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/EmptyElementType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/EnableVgwRoutePropagation.java   | 16 ++++++++++++++++
 .../ec2/EnableVgwRoutePropagationRequestType.java   | 16 ++++++++++++++++
 .../ec2/EnableVgwRoutePropagationResponse.java      | 16 ++++++++++++++++
 .../ec2/EnableVgwRoutePropagationResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/EnableVolumeIO.java       | 16 ++++++++++++++++
 .../src/com/amazon/ec2/EnableVolumeIOResponse.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/EnableVolumeIOResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/EnableVolumeIOType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ExportTaskIdType.java     | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ExportTaskResponseType.java  | 16 ++++++++++++++++
 .../ec2/ExportTaskResponseTypeChoice_type0.java     | 16 ++++++++++++++++
 .../ec2/ExportTaskResponseTypeChoice_type1.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/ExportTaskSetResponseType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/ExportToS3TaskResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ExportToS3TaskType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ExtensionMapper.java      | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/FilterSetType.java        | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/FilterType.java           | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/GetConsoleOutput.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/GetConsoleOutputResponse.java    | 16 ++++++++++++++++
 .../amazon/ec2/GetConsoleOutputResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/GetConsoleOutputType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/GetPasswordData.java      | 16 ++++++++++++++++
 .../src/com/amazon/ec2/GetPasswordDataResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/GetPasswordDataResponseType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/GetPasswordDataType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/GroupItemType.java        | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/GroupSetType.java         | 16 ++++++++++++++++
 .../amazon/ec2/IamInstanceProfileRequestType.java   | 16 ++++++++++++++++
 .../amazon/ec2/IamInstanceProfileResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ImportInstance.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/ImportInstanceGroupItemType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/ImportInstanceGroupSetType.java  | 16 ++++++++++++++++
 .../ec2/ImportInstanceLaunchSpecificationType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ImportInstanceResponse.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/ImportInstanceResponseType.java  | 16 ++++++++++++++++
 .../amazon/ec2/ImportInstanceTaskDetailsType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ImportInstanceType.java   | 16 ++++++++++++++++
 .../ec2/ImportInstanceVolumeDetailItemType.java     | 16 ++++++++++++++++
 .../ec2/ImportInstanceVolumeDetailSetType.java      | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ImportKeyPair.java        | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ImportKeyPairResponse.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/ImportKeyPairResponseType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ImportKeyPairType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ImportVolume.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ImportVolumeResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/ImportVolumeResponseType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/ImportVolumeTaskDetailsType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ImportVolumeType.java     | 16 ++++++++++++++++
 .../ec2/InstanceBlockDeviceMappingItemType.java     | 16 ++++++++++++++++
 ...tanceBlockDeviceMappingItemTypeChoice_type0.java | 16 ++++++++++++++++
 .../InstanceBlockDeviceMappingResponseItemType.java | 16 ++++++++++++++++
 ...ckDeviceMappingResponseItemTypeChoice_type0.java | 16 ++++++++++++++++
 .../ec2/InstanceBlockDeviceMappingResponseType.java | 16 ++++++++++++++++
 .../amazon/ec2/InstanceBlockDeviceMappingType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/InstanceCountsSetItemType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/InstanceCountsSetType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/InstanceEbsBlockDeviceType.java  | 16 ++++++++++++++++
 .../amazon/ec2/InstanceExportTaskResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/InstanceIdSetType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/InstanceIdType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/InstanceLicenseRequestType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/InstanceLicenseResponseType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/InstanceMonitoringStateType.java | 16 ++++++++++++++++
 .../InstanceNetworkInterfaceAssociationType.java    | 16 ++++++++++++++++
 .../ec2/InstanceNetworkInterfaceAttachmentType.java | 16 ++++++++++++++++
 .../InstanceNetworkInterfaceSetItemRequestType.java | 16 ++++++++++++++++
 .../ec2/InstanceNetworkInterfaceSetItemType.java    | 16 ++++++++++++++++
 .../ec2/InstanceNetworkInterfaceSetRequestType.java | 16 ++++++++++++++++
 .../amazon/ec2/InstanceNetworkInterfaceSetType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/InstancePlacementType.java   | 16 ++++++++++++++++
 .../ec2/InstancePrivateIpAddressesSetItemType.java  | 16 ++++++++++++++++
 .../ec2/InstancePrivateIpAddressesSetType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/InstanceStateChangeSetType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/InstanceStateChangeType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/InstanceStateType.java    | 16 ++++++++++++++++
 .../ec2/InstanceStatusDetailsSetItemType.java       | 16 ++++++++++++++++
 .../amazon/ec2/InstanceStatusDetailsSetType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/InstanceStatusEventType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/InstanceStatusEventsSetType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/InstanceStatusItemType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/InstanceStatusSetType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/InstanceStatusType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/InstanceTypeSetItemType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/InstanceTypeSetType.java  | 16 ++++++++++++++++
 .../ec2/InternetGatewayAttachmentSetType.java       | 16 ++++++++++++++++
 .../amazon/ec2/InternetGatewayAttachmentType.java   | 16 ++++++++++++++++
 .../amazon/ec2/InternetGatewayIdSetItemType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/InternetGatewayIdSetType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/InternetGatewaySetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/InternetGatewayType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/IpPermissionSetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/IpPermissionType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/IpRangeItemType.java      | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/IpRangeSetType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/LaunchPermissionItemType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/LaunchPermissionListType.java    | 16 ++++++++++++++++
 .../amazon/ec2/LaunchPermissionOperationType.java   | 16 ++++++++++++++++
 .../amazon/ec2/LaunchSpecificationRequestType.java  | 16 ++++++++++++++++
 .../amazon/ec2/LaunchSpecificationResponseType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/LicenseCapacitySetItemType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/LicenseCapacitySetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/LicenseIdSetType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/LicenseSetItemType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/LicenseSetType.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ModifyImageAttribute.java | 16 ++++++++++++++++
 .../amazon/ec2/ModifyImageAttributeResponse.java    | 16 ++++++++++++++++
 .../ec2/ModifyImageAttributeResponseType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/ModifyImageAttributeType.java    | 16 ++++++++++++++++
 .../ec2/ModifyImageAttributeTypeChoice_type0.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ModifyInstanceAttribute.java | 16 ++++++++++++++++
 .../amazon/ec2/ModifyInstanceAttributeResponse.java | 16 ++++++++++++++++
 .../ec2/ModifyInstanceAttributeResponseType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/ModifyInstanceAttributeType.java | 16 ++++++++++++++++
 .../ModifyInstanceAttributeTypeChoice_type0.java    | 16 ++++++++++++++++
 .../ec2/ModifyNetworkInterfaceAttachmentType.java   | 16 ++++++++++++++++
 .../amazon/ec2/ModifyNetworkInterfaceAttribute.java | 16 ++++++++++++++++
 .../ModifyNetworkInterfaceAttributeResponse.java    | 16 ++++++++++++++++
 ...ModifyNetworkInterfaceAttributeResponseType.java | 16 ++++++++++++++++
 .../ec2/ModifyNetworkInterfaceAttributeType.java    | 16 ++++++++++++++++
 ...fyNetworkInterfaceAttributeTypeChoice_type0.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ModifySnapshotAttribute.java | 16 ++++++++++++++++
 .../amazon/ec2/ModifySnapshotAttributeResponse.java | 16 ++++++++++++++++
 .../ec2/ModifySnapshotAttributeResponseType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/ModifySnapshotAttributeType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ModifyVolumeAttribute.java   | 16 ++++++++++++++++
 .../amazon/ec2/ModifyVolumeAttributeResponse.java   | 16 ++++++++++++++++
 .../ec2/ModifyVolumeAttributeResponseType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/ModifyVolumeAttributeType.java   | 16 ++++++++++++++++
 .../ec2/ModifyVolumeAttributeTypeChoice_type0.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/MonitorInstances.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/MonitorInstancesResponse.java    | 16 ++++++++++++++++
 .../ec2/MonitorInstancesResponseSetItemType.java    | 16 ++++++++++++++++
 .../amazon/ec2/MonitorInstancesResponseSetType.java | 16 ++++++++++++++++
 .../amazon/ec2/MonitorInstancesResponseType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/MonitorInstancesSetItemType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/MonitorInstancesSetType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/MonitorInstancesType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/MonitoringInstanceType.java  | 16 ++++++++++++++++
 .../amazon/ec2/NetworkAclAssociationSetType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/NetworkAclAssociationType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/NetworkAclEntrySetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/NetworkAclEntryType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/NetworkAclIdSetItemType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/NetworkAclSetType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/NetworkAclType.java       | 16 ++++++++++++++++
 .../amazon/ec2/NetworkInterfaceAssociationType.java | 16 ++++++++++++++++
 .../amazon/ec2/NetworkInterfaceAttachmentType.java  | 16 ++++++++++++++++
 .../amazon/ec2/NetworkInterfaceIdSetItemType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/NetworkInterfaceIdSetType.java   | 16 ++++++++++++++++
 ...tworkInterfacePrivateIpAddressesSetItemType.java | 16 ++++++++++++++++
 .../NetworkInterfacePrivateIpAddressesSetType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/NetworkInterfaceSetType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/NetworkInterfaceType.java | 16 ++++++++++++++++
 .../ec2/NullableAttributeBooleanValueType.java      | 16 ++++++++++++++++
 .../com/amazon/ec2/NullableAttributeValueType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/PlacementGroupInfoType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/PlacementGroupSetType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/PlacementRequestType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/PlacementResponseType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/PortRangeType.java        | 16 ++++++++++++++++
 .../amazon/ec2/PriceScheduleRequestSetItemType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/PriceScheduleRequestSetType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/PriceScheduleSetItemType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/PriceScheduleSetType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/PricingDetailsSetItemType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/PricingDetailsSetType.java   | 16 ++++++++++++++++
 .../ec2/PrivateIpAddressesSetItemRequestType.java   | 16 ++++++++++++++++
 .../ec2/PrivateIpAddressesSetRequestType.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ProductCodeItemType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ProductCodeListType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ProductCodesSetItemType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ProductCodesSetType.java  | 16 ++++++++++++++++
 .../amazon/ec2/ProductDescriptionSetItemType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/ProductDescriptionSetType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/PropagatingVgwSetType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/PropagatingVgwType.java   | 16 ++++++++++++++++
 .../ec2/PurchaseReservedInstancesOffering.java      | 16 ++++++++++++++++
 .../PurchaseReservedInstancesOfferingResponse.java  | 16 ++++++++++++++++
 ...rchaseReservedInstancesOfferingResponseType.java | 16 ++++++++++++++++
 .../ec2/PurchaseReservedInstancesOfferingType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RebootInstances.java      | 16 ++++++++++++++++
 .../src/com/amazon/ec2/RebootInstancesInfoType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/RebootInstancesItemType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/RebootInstancesResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/RebootInstancesResponseType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RebootInstancesType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/RecurringChargesSetItemType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/RecurringChargesSetType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RegionItemType.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RegionSetType.java        | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RegisterImage.java        | 16 ++++++++++++++++
 .../src/com/amazon/ec2/RegisterImageResponse.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/RegisterImageResponseType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RegisterImageType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ReleaseAddress.java       | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ReleaseAddressResponse.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/ReleaseAddressResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ReleaseAddressType.java   | 16 ++++++++++++++++
 .../amazon/ec2/ReleaseAddressTypeChoice_type0.java  | 16 ++++++++++++++++
 .../amazon/ec2/ReplaceNetworkAclAssociation.java    | 16 ++++++++++++++++
 .../ec2/ReplaceNetworkAclAssociationResponse.java   | 16 ++++++++++++++++
 .../ReplaceNetworkAclAssociationResponseType.java   | 16 ++++++++++++++++
 .../ec2/ReplaceNetworkAclAssociationType.java       | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ReplaceNetworkAclEntry.java  | 16 ++++++++++++++++
 .../amazon/ec2/ReplaceNetworkAclEntryResponse.java  | 16 ++++++++++++++++
 .../ec2/ReplaceNetworkAclEntryResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/ReplaceNetworkAclEntryType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ReplaceRoute.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/ReplaceRouteResponseType.java    | 16 ++++++++++++++++
 .../amazon/ec2/ReplaceRouteTableAssociation.java    | 16 ++++++++++++++++
 .../ec2/ReplaceRouteTableAssociationResponse.java   | 16 ++++++++++++++++
 .../ReplaceRouteTableAssociationResponseType.java   | 16 ++++++++++++++++
 .../ec2/ReplaceRouteTableAssociationType.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ReplaceRouteType.java     | 16 ++++++++++++++++
 .../amazon/ec2/ReplaceRouteTypeChoice_type0.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ReportInstanceStatus.java | 16 ++++++++++++++++
 .../ReportInstanceStatusReasonCodeSetItemType.java  | 16 ++++++++++++++++
 .../ec2/ReportInstanceStatusReasonCodesSetType.java | 16 ++++++++++++++++
 .../amazon/ec2/ReportInstanceStatusResponse.java    | 16 ++++++++++++++++
 .../ec2/ReportInstanceStatusResponseType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/ReportInstanceStatusType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RequestSpotInstances.java | 16 ++++++++++++++++
 .../amazon/ec2/RequestSpotInstancesResponse.java    | 16 ++++++++++++++++
 .../ec2/RequestSpotInstancesResponseType.java       | 16 ++++++++++++++++
 .../com/amazon/ec2/RequestSpotInstancesType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ReservationInfoType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ReservationSetType.java   | 16 ++++++++++++++++
 .../amazon/ec2/ReservedInstanceLimitPriceType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ResetImageAttribute.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/ResetImageAttributeResponse.java | 16 ++++++++++++++++
 .../amazon/ec2/ResetImageAttributeResponseType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ResetImageAttributeType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/ResetImageAttributesGroup.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ResetInstanceAttribute.java  | 16 ++++++++++++++++
 .../amazon/ec2/ResetInstanceAttributeResponse.java  | 16 ++++++++++++++++
 .../ec2/ResetInstanceAttributeResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/ResetInstanceAttributeType.java  | 16 ++++++++++++++++
 .../amazon/ec2/ResetInstanceAttributesGroup.java    | 16 ++++++++++++++++
 .../amazon/ec2/ResetNetworkInterfaceAttribute.java  | 16 ++++++++++++++++
 .../ec2/ResetNetworkInterfaceAttributeResponse.java | 16 ++++++++++++++++
 .../ResetNetworkInterfaceAttributeResponseType.java | 16 ++++++++++++++++
 .../ec2/ResetNetworkInterfaceAttributeType.java     | 16 ++++++++++++++++
 .../ec2/ResetNetworkInterfaceAttributesGroup.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ResetSnapshotAttribute.java  | 16 ++++++++++++++++
 .../amazon/ec2/ResetSnapshotAttributeResponse.java  | 16 ++++++++++++++++
 .../ec2/ResetSnapshotAttributeResponseType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/ResetSnapshotAttributeType.java  | 16 ++++++++++++++++
 .../amazon/ec2/ResetSnapshotAttributesGroup.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ResourceIdSetItemType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ResourceIdSetType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/ResourceTagSetItemType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ResourceTagSetType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/RevokeSecurityGroupEgress.java   | 16 ++++++++++++++++
 .../ec2/RevokeSecurityGroupEgressResponse.java      | 16 ++++++++++++++++
 .../ec2/RevokeSecurityGroupEgressResponseType.java  | 16 ++++++++++++++++
 .../amazon/ec2/RevokeSecurityGroupEgressType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/RevokeSecurityGroupIngress.java  | 16 ++++++++++++++++
 .../ec2/RevokeSecurityGroupIngressResponse.java     | 16 ++++++++++++++++
 .../ec2/RevokeSecurityGroupIngressResponseType.java | 16 ++++++++++++++++
 .../amazon/ec2/RevokeSecurityGroupIngressType.java  | 16 ++++++++++++++++
 .../RevokeSecurityGroupIngressTypeChoice_type0.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RouteSetType.java         | 16 ++++++++++++++++
 .../amazon/ec2/RouteTableAssociationSetType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/RouteTableAssociationType.java   | 16 ++++++++++++++++
 .../ec2/RouteTableAssociationTypeChoice_type0.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/RouteTableIdSetItemType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RouteTableIdSetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RouteTableSetType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RouteTableType.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RouteType.java            | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RunInstances.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RunInstancesResponse.java | 16 ++++++++++++++++
 .../com/amazon/ec2/RunInstancesResponseType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/RunInstancesType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/RunningInstancesItemType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/RunningInstancesSetType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/SecurityGroupIdSetItemType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/SecurityGroupIdSetType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/SecurityGroupItemType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/SecurityGroupSetType.java | 16 ++++++++++++++++
 .../amazon/ec2/SpotDatafeedSubscriptionType.java    | 16 ++++++++++++++++
 .../ec2/SpotInstanceRequestIdSetItemType.java       | 16 ++++++++++++++++
 .../amazon/ec2/SpotInstanceRequestIdSetType.java    | 16 ++++++++++++++++
 .../amazon/ec2/SpotInstanceRequestSetItemType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/SpotInstanceRequestSetType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/SpotInstanceStateFaultType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/SpotPlacementRequestType.java    | 16 ++++++++++++++++
 .../com/amazon/ec2/SpotPriceHistorySetItemType.java | 16 ++++++++++++++++
 .../src/com/amazon/ec2/SpotPriceHistorySetType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/StartInstances.java       | 16 ++++++++++++++++
 .../src/com/amazon/ec2/StartInstancesResponse.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/StartInstancesResponseType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/StartInstancesType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/StateReasonType.java      | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/StopInstances.java        | 16 ++++++++++++++++
 .../src/com/amazon/ec2/StopInstancesResponse.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/StopInstancesResponseType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/StopInstancesType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/SubnetIdSetType.java      | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/SubnetSetType.java        | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/SubnetType.java           | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/TagSetItemType.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/TagSetType.java           | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/TerminateInstances.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/TerminateInstancesResponse.java  | 16 ++++++++++++++++
 .../amazon/ec2/TerminateInstancesResponseType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/TerminateInstancesType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/UnassignPrivateIpAddresses.java  | 16 ++++++++++++++++
 .../ec2/UnassignPrivateIpAddressesResponse.java     | 16 ++++++++++++++++
 .../ec2/UnassignPrivateIpAddressesResponseType.java | 16 ++++++++++++++++
 .../amazon/ec2/UnassignPrivateIpAddressesType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/UnmonitorInstances.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/UnmonitorInstancesResponse.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/UserDataType.java         | 16 ++++++++++++++++
 .../src/com/amazon/ec2/UserIdGroupPairSetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/UserIdGroupPairType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ValueSetType.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/ValueType.java            | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VgwTelemetryType.java     | 16 ++++++++++++++++
 .../com/amazon/ec2/VolumeStatusActionItemType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/VolumeStatusActionsSetType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/VolumeStatusDetailsItemType.java | 16 ++++++++++++++++
 .../com/amazon/ec2/VolumeStatusDetailsSetType.java  | 16 ++++++++++++++++
 .../com/amazon/ec2/VolumeStatusEventItemType.java   | 16 ++++++++++++++++
 .../com/amazon/ec2/VolumeStatusEventsSetType.java   | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VolumeStatusItemType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VolumeStatusSetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VpcIdSetItemType.java     | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VpcIdSetType.java         | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VpcSetType.java           | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VpcType.java              | 16 ++++++++++++++++
 .../com/amazon/ec2/VpnConnectionIdSetItemType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/VpnConnectionIdSetType.java  | 16 ++++++++++++++++
 .../amazon/ec2/VpnConnectionOptionsRequestType.java | 16 ++++++++++++++++
 .../ec2/VpnConnectionOptionsResponseType.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VpnConnectionSetType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VpnConnectionType.java    | 16 ++++++++++++++++
 .../src/com/amazon/ec2/VpnGatewayIdSetItemType.java | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java  | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VpnGatewaySetType.java    | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VpnGatewayType.java       | 16 ++++++++++++++++
 awsapi/src/com/amazon/ec2/VpnStaticRouteType.java   | 16 ++++++++++++++++
 .../src/com/amazon/ec2/VpnStaticRoutesSetType.java  | 16 ++++++++++++++++
 .../src/com/amazon/ec2/VpnTunnelTelemetryType.java  | 16 ++++++++++++++++
 915 files changed, 14640 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ActivateLicense.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicense.java b/awsapi/src/com/amazon/ec2/ActivateLicense.java
index 83797f6..397fcb8 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicense.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicense.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ActivateLicense.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
index 0c6103b..55c4b84 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ActivateLicenseResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
index e97f4c8..e3309cb 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ActivateLicenseResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
index 0e021b6..522e6e8 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ActivateLicenseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AllocateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddress.java b/awsapi/src/com/amazon/ec2/AllocateAddress.java
index daf3fcd..0c8dd61 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddress.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddress.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AllocateAddress.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
index f7abe48..7619a04 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AllocateAddressResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
index afe213d..24f5699 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AllocateAddressResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AllocateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressType.java b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
index 5310992..f608ad9 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AllocateAddressType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
index 744e128..2acfbad 100644
--- a/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AllocationIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocationIdSetType.java b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
index 67d34bc..861c026 100644
--- a/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AllocationIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
index 912485d..53c8e17 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AmazonEC2MessageReceiverInOut.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
index f0081e9..ba80059 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AmazonEC2Skeleton.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
index a506259..535bdfd 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AmazonEC2SkeletonInterface.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
index ae81126..27cbe48 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssignPrivateIpAddresses.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
index 86e4f68..c83dcfe 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssignPrivateIpAddressesResponse.java


[19/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableType.java b/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
new file mode 100644
index 0000000..6989140
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
@@ -0,0 +1,483 @@
+
+/**
+ * CreateRouteTableType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateRouteTableType bean class
+            */
+        
+        public  class CreateRouteTableType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateRouteTableType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for VpcId
+                        */
+
+                        
+                                    protected java.lang.String localVpcId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getVpcId(){
+                               return localVpcId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param VpcId
+                               */
+                               public void setVpcId(java.lang.String param){
+                            
+                                            this.localVpcId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateRouteTableType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateRouteTableType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateRouteTableType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"vpcId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"vpcId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("vpcId");
+                                    }
+                                
+
+                                          if (localVpcId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("vpcId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localVpcId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "vpcId"));
+                                 
+                                        if (localVpcId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVpcId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("vpcId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateRouteTableType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateRouteTableType object =
+                new CreateRouteTableType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateRouteTableType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateRouteTableType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpcId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setVpcId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteType.java b/awsapi/src/com/amazon/ec2/CreateRouteType.java
new file mode 100644
index 0000000..616ff65
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateRouteType.java
@@ -0,0 +1,628 @@
+
+/**
+ * CreateRouteType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateRouteType bean class
+            */
+        
+        public  class CreateRouteType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateRouteType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RouteTableId
+                        */
+
+                        
+                                    protected java.lang.String localRouteTableId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRouteTableId(){
+                               return localRouteTableId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RouteTableId
+                               */
+                               public void setRouteTableId(java.lang.String param){
+                            
+                                            this.localRouteTableId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for DestinationCidrBlock
+                        */
+
+                        
+                                    protected java.lang.String localDestinationCidrBlock ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getDestinationCidrBlock(){
+                               return localDestinationCidrBlock;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DestinationCidrBlock
+                               */
+                               public void setDestinationCidrBlock(java.lang.String param){
+                            
+                                            this.localDestinationCidrBlock=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for CreateRouteTypeChoice_type0
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateRouteTypeChoice_type0 localCreateRouteTypeChoice_type0 ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateRouteTypeChoice_type0
+                           */
+                           public  com.amazon.ec2.CreateRouteTypeChoice_type0 getCreateRouteTypeChoice_type0(){
+                               return localCreateRouteTypeChoice_type0;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateRouteTypeChoice_type0
+                               */
+                               public void setCreateRouteTypeChoice_type0(com.amazon.ec2.CreateRouteTypeChoice_type0 param){
+                            
+                                            this.localCreateRouteTypeChoice_type0=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateRouteType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateRouteType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateRouteType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"routeTableId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"routeTableId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("routeTableId");
+                                    }
+                                
+
+                                          if (localRouteTableId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("routeTableId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRouteTableId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"destinationCidrBlock", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"destinationCidrBlock");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("destinationCidrBlock");
+                                    }
+                                
+
+                                          if (localDestinationCidrBlock==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("destinationCidrBlock cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localDestinationCidrBlock);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                            if (localCreateRouteTypeChoice_type0==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("CreateRouteTypeChoice_type0 cannot be null!!");
+                                            }
+                                           localCreateRouteTypeChoice_type0.serialize(null,factory,xmlWriter);
+                                        
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "routeTableId"));
+                                 
+                                        if (localRouteTableId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRouteTableId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("routeTableId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "destinationCidrBlock"));
+                                 
+                                        if (localDestinationCidrBlock != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDestinationCidrBlock));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("destinationCidrBlock cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "CreateRouteTypeChoice_type0"));
+                            
+                            
+                                    if (localCreateRouteTypeChoice_type0==null){
+                                         throw new org.apache.axis2.databinding.ADBException("CreateRouteTypeChoice_type0 cannot be null!!");
+                                    }
+                                    elementList.add(localCreateRouteTypeChoice_type0);
+                                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateRouteType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateRouteType object =
+                new CreateRouteType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateRouteType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateRouteType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","routeTableId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRouteTableId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","destinationCidrBlock").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setDestinationCidrBlock(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() ){
+                                
+                                                object.setCreateRouteTypeChoice_type0(com.amazon.ec2.CreateRouteTypeChoice_type0.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                  
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
new file mode 100644
index 0000000..813c355
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
@@ -0,0 +1,649 @@
+
+/**
+ * CreateRouteTypeChoice_type0.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateRouteTypeChoice_type0 bean class
+            */
+        
+        public  class CreateRouteTypeChoice_type0
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateRouteTypeChoice_type0
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+            /** Whenever a new property is set ensure all others are unset
+             *  There can be only one choice and the last one wins
+             */
+            private void clearAllSettingTrackers() {
+            
+                   localGatewayIdTracker = false;
+                
+                   localInstanceIdTracker = false;
+                
+                   localNetworkInterfaceIdTracker = false;
+                
+            }
+        
+
+                        /**
+                        * field for GatewayId
+                        */
+
+                        
+                                    protected java.lang.String localGatewayId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localGatewayIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getGatewayId(){
+                               return localGatewayId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param GatewayId
+                               */
+                               public void setGatewayId(java.lang.String param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localGatewayIdTracker = true;
+                                       } else {
+                                          localGatewayIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localGatewayId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for InstanceId
+                        */
+
+                        
+                                    protected java.lang.String localInstanceId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localInstanceIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getInstanceId(){
+                               return localInstanceId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param InstanceId
+                               */
+                               public void setInstanceId(java.lang.String param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localInstanceIdTracker = true;
+                                       } else {
+                                          localInstanceIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localInstanceId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for NetworkInterfaceId
+                        */
+
+                        
+                                    protected java.lang.String localNetworkInterfaceId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localNetworkInterfaceIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getNetworkInterfaceId(){
+                               return localNetworkInterfaceId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkInterfaceId
+                               */
+                               public void setNetworkInterfaceId(java.lang.String param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localNetworkInterfaceIdTracker = true;
+                                       } else {
+                                          localNetworkInterfaceIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localNetworkInterfaceId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateRouteTypeChoice_type0.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateRouteTypeChoice_type0",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateRouteTypeChoice_type0",
+                           xmlWriter);
+                   }
+
+               
+                   }
+                if (localGatewayIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"gatewayId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"gatewayId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("gatewayId");
+                                    }
+                                
+
+                                          if (localGatewayId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("gatewayId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localGatewayId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localInstanceIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"instanceId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"instanceId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("instanceId");
+                                    }
+                                
+
+                                          if (localInstanceId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localInstanceId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localNetworkInterfaceIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"networkInterfaceId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"networkInterfaceId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("networkInterfaceId");
+                                    }
+                                
+
+                                          if (localNetworkInterfaceId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localNetworkInterfaceId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                 if (localGatewayIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "gatewayId"));
+                                 
+                                        if (localGatewayId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localGatewayId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("gatewayId cannot be null!!");
+                                        }
+                                    } if (localInstanceIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "instanceId"));
+                                 
+                                        if (localInstanceId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localInstanceId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
+                                        }
+                                    } if (localNetworkInterfaceIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkInterfaceId"));
+                                 
+                                        if (localNetworkInterfaceId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNetworkInterfaceId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("networkInterfaceId cannot be null!!");
+                                        }
+                                    }
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateRouteTypeChoice_type0 parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateRouteTypeChoice_type0 object =
+                new CreateRouteTypeChoice_type0();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","gatewayId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setGatewayId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                        else
+                                    
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setInstanceId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                        else
+                                    
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkInterfaceId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setNetworkInterfaceId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
index 61c56fb..d4606cd 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateSecurityGroup.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateSecurityGroup",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateSecurityGroup").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateSecurityGroup").equals(reader.getName())){
                                 
                                                 object.setCreateSecurityGroup(com.amazon.ec2.CreateSecurityGroupType.Factory.parse(reader));
                                             


[25/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
new file mode 100644
index 0000000..25f9929
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
@@ -0,0 +1,1075 @@
+
+/**
+ * CreateNetworkAclEntryType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkAclEntryType bean class
+            */
+        
+        public  class CreateNetworkAclEntryType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateNetworkAclEntryType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for NetworkAclId
+                        */
+
+                        
+                                    protected java.lang.String localNetworkAclId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getNetworkAclId(){
+                               return localNetworkAclId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkAclId
+                               */
+                               public void setNetworkAclId(java.lang.String param){
+                            
+                                            this.localNetworkAclId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for RuleNumber
+                        */
+
+                        
+                                    protected int localRuleNumber ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return int
+                           */
+                           public  int getRuleNumber(){
+                               return localRuleNumber;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RuleNumber
+                               */
+                               public void setRuleNumber(int param){
+                            
+                                            this.localRuleNumber=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for Protocol
+                        */
+
+                        
+                                    protected java.lang.String localProtocol ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getProtocol(){
+                               return localProtocol;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Protocol
+                               */
+                               public void setProtocol(java.lang.String param){
+                            
+                                            this.localProtocol=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for RuleAction
+                        */
+
+                        
+                                    protected java.lang.String localRuleAction ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRuleAction(){
+                               return localRuleAction;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RuleAction
+                               */
+                               public void setRuleAction(java.lang.String param){
+                            
+                                            this.localRuleAction=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for Egress
+                        */
+
+                        
+                                    protected boolean localEgress ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean getEgress(){
+                               return localEgress;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Egress
+                               */
+                               public void setEgress(boolean param){
+                            
+                                            this.localEgress=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for CidrBlock
+                        */
+
+                        
+                                    protected java.lang.String localCidrBlock ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getCidrBlock(){
+                               return localCidrBlock;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CidrBlock
+                               */
+                               public void setCidrBlock(java.lang.String param){
+                            
+                                            this.localCidrBlock=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for IcmpTypeCode
+                        */
+
+                        
+                                    protected com.amazon.ec2.IcmpTypeCodeType localIcmpTypeCode ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localIcmpTypeCodeTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.IcmpTypeCodeType
+                           */
+                           public  com.amazon.ec2.IcmpTypeCodeType getIcmpTypeCode(){
+                               return localIcmpTypeCode;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param IcmpTypeCode
+                               */
+                               public void setIcmpTypeCode(com.amazon.ec2.IcmpTypeCodeType param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localIcmpTypeCodeTracker = true;
+                                       } else {
+                                          localIcmpTypeCodeTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localIcmpTypeCode=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for PortRange
+                        */
+
+                        
+                                    protected com.amazon.ec2.PortRangeType localPortRange ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localPortRangeTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.PortRangeType
+                           */
+                           public  com.amazon.ec2.PortRangeType getPortRange(){
+                               return localPortRange;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param PortRange
+                               */
+                               public void setPortRange(com.amazon.ec2.PortRangeType param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localPortRangeTracker = true;
+                                       } else {
+                                          localPortRangeTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localPortRange=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkAclEntryType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateNetworkAclEntryType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateNetworkAclEntryType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"networkAclId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"networkAclId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("networkAclId");
+                                    }
+                                
+
+                                          if (localNetworkAclId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("networkAclId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localNetworkAclId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"ruleNumber", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"ruleNumber");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("ruleNumber");
+                                    }
+                                
+                                               if (localRuleNumber==java.lang.Integer.MIN_VALUE) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("ruleNumber cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRuleNumber));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"protocol", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"protocol");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("protocol");
+                                    }
+                                
+
+                                          if (localProtocol==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("protocol cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localProtocol);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"ruleAction", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"ruleAction");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("ruleAction");
+                                    }
+                                
+
+                                          if (localRuleAction==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("ruleAction cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRuleAction);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"egress", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"egress");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("egress");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("egress cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localEgress));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"cidrBlock", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"cidrBlock");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("cidrBlock");
+                                    }
+                                
+
+                                          if (localCidrBlock==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("cidrBlock cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localCidrBlock);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                              if (localIcmpTypeCodeTracker){
+                                            if (localIcmpTypeCode==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("icmpTypeCode cannot be null!!");
+                                            }
+                                           localIcmpTypeCode.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","icmpTypeCode"),
+                                               factory,xmlWriter);
+                                        } if (localPortRangeTracker){
+                                            if (localPortRange==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("portRange cannot be null!!");
+                                            }
+                                           localPortRange.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","portRange"),
+                                               factory,xmlWriter);
+                                        }
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkAclId"));
+                                 
+                                        if (localNetworkAclId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNetworkAclId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("networkAclId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "ruleNumber"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRuleNumber));
+                            
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "protocol"));
+                                 
+                                        if (localProtocol != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localProtocol));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("protocol cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "ruleAction"));
+                                 
+                                        if (localRuleAction != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRuleAction));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("ruleAction cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "egress"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localEgress));
+                            
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "cidrBlock"));
+                                 
+                                        if (localCidrBlock != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localCidrBlock));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("cidrBlock cannot be null!!");
+                                        }
+                                     if (localIcmpTypeCodeTracker){
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "icmpTypeCode"));
+                            
+                            
+                                    if (localIcmpTypeCode==null){
+                                         throw new org.apache.axis2.databinding.ADBException("icmpTypeCode cannot be null!!");
+                                    }
+                                    elementList.add(localIcmpTypeCode);
+                                } if (localPortRangeTracker){
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "portRange"));
+                            
+                            
+                                    if (localPortRange==null){
+                                         throw new org.apache.axis2.databinding.ADBException("portRange cannot be null!!");
+                                    }
+                                    elementList.add(localPortRange);
+                                }
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkAclEntryType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkAclEntryType object =
+                new CreateNetworkAclEntryType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateNetworkAclEntryType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateNetworkAclEntryType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkAclId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setNetworkAclId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ruleNumber").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRuleNumber(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToInt(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","protocol").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setProtocol(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ruleAction").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRuleAction(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","egress").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setEgress(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","cidrBlock").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setCidrBlock(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","icmpTypeCode").equals(reader.getName())){
+                                
+                                                object.setIcmpTypeCode(com.amazon.ec2.IcmpTypeCodeType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","portRange").equals(reader.getName())){
+                                
+                                                object.setPortRange(com.amazon.ec2.PortRangeType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                  
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
new file mode 100644
index 0000000..7e861d2
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateNetworkAclResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkAclResponse bean class
+            */
+        
+        public  class CreateNetworkAclResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateNetworkAclResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateNetworkAclResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateNetworkAclResponseType localCreateNetworkAclResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateNetworkAclResponseType
+                           */
+                           public  com.amazon.ec2.CreateNetworkAclResponseType getCreateNetworkAclResponse(){
+                               return localCreateNetworkAclResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateNetworkAclResponse
+                               */
+                               public void setCreateNetworkAclResponse(com.amazon.ec2.CreateNetworkAclResponseType param){
+                            
+                                            this.localCreateNetworkAclResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkAclResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateNetworkAclResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateNetworkAclResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateNetworkAclResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkAclResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkAclResponse object =
+                new CreateNetworkAclResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateNetworkAclResponse").equals(reader.getName())){
+                                
+                                                object.setCreateNetworkAclResponse(com.amazon.ec2.CreateNetworkAclResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[20/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java b/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
new file mode 100644
index 0000000..32c9b20
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * CreateRouteResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateRouteResponseType bean class
+            */
+        
+        public  class CreateRouteResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateRouteResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateRouteResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateRouteResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateRouteResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateRouteResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateRouteResponseType object =
+                new CreateRouteResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateRouteResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateRouteResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTable.java b/awsapi/src/com/amazon/ec2/CreateRouteTable.java
new file mode 100644
index 0000000..888c248
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTable.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateRouteTable.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateRouteTable bean class
+            */
+        
+        public  class CreateRouteTable
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateRouteTable",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateRouteTable
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateRouteTableType localCreateRouteTable ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateRouteTableType
+                           */
+                           public  com.amazon.ec2.CreateRouteTableType getCreateRouteTable(){
+                               return localCreateRouteTable;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateRouteTable
+                               */
+                               public void setCreateRouteTable(com.amazon.ec2.CreateRouteTableType param){
+                            
+                                            this.localCreateRouteTable=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateRouteTable.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateRouteTable==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateRouteTable.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateRouteTable.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateRouteTable parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateRouteTable object =
+                new CreateRouteTable();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateRouteTable").equals(reader.getName())){
+                                
+                                                object.setCreateRouteTable(com.amazon.ec2.CreateRouteTableType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
new file mode 100644
index 0000000..b7907d8
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateRouteTableResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateRouteTableResponse bean class
+            */
+        
+        public  class CreateRouteTableResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateRouteTableResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateRouteTableResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateRouteTableResponseType localCreateRouteTableResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateRouteTableResponseType
+                           */
+                           public  com.amazon.ec2.CreateRouteTableResponseType getCreateRouteTableResponse(){
+                               return localCreateRouteTableResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateRouteTableResponse
+                               */
+                               public void setCreateRouteTableResponse(com.amazon.ec2.CreateRouteTableResponseType param){
+                            
+                                            this.localCreateRouteTableResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateRouteTableResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateRouteTableResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateRouteTableResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateRouteTableResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateRouteTableResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateRouteTableResponse object =
+                new CreateRouteTableResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateRouteTableResponse").equals(reader.getName())){
+                                
+                                                object.setCreateRouteTableResponse(com.amazon.ec2.CreateRouteTableResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
new file mode 100644
index 0000000..33e2202
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
@@ -0,0 +1,544 @@
+
+/**
+ * CreateRouteTableResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateRouteTableResponseType bean class
+            */
+        
+        public  class CreateRouteTableResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateRouteTableResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for RouteTable
+                        */
+
+                        
+                                    protected com.amazon.ec2.RouteTableType localRouteTable ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.RouteTableType
+                           */
+                           public  com.amazon.ec2.RouteTableType getRouteTable(){
+                               return localRouteTable;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RouteTable
+                               */
+                               public void setRouteTable(com.amazon.ec2.RouteTableType param){
+                            
+                                            this.localRouteTable=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateRouteTableResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateRouteTableResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateRouteTableResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                            if (localRouteTable==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("routeTable cannot be null!!");
+                                            }
+                                           localRouteTable.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","routeTable"),
+                                               factory,xmlWriter);
+                                        
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "routeTable"));
+                            
+                            
+                                    if (localRouteTable==null){
+                                         throw new org.apache.axis2.databinding.ADBException("routeTable cannot be null!!");
+                                    }
+                                    elementList.add(localRouteTable);
+                                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateRouteTableResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateRouteTableResponseType object =
+                new CreateRouteTableResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateRouteTableResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateRouteTableResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","routeTable").equals(reader.getName())){
+                                
+                                                object.setRouteTable(com.amazon.ec2.RouteTableType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[35/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
new file mode 100644
index 0000000..4155af0
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
@@ -0,0 +1,545 @@
+
+/**
+ * AuthorizeSecurityGroupIngressTypeChoice_type0.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AuthorizeSecurityGroupIngressTypeChoice_type0 bean class
+            */
+        
+        public  class AuthorizeSecurityGroupIngressTypeChoice_type0
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AuthorizeSecurityGroupIngressTypeChoice_type0
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+            /** Whenever a new property is set ensure all others are unset
+             *  There can be only one choice and the last one wins
+             */
+            private void clearAllSettingTrackers() {
+            
+                   localGroupIdTracker = false;
+                
+                   localGroupNameTracker = false;
+                
+            }
+        
+
+                        /**
+                        * field for GroupId
+                        */
+
+                        
+                                    protected java.lang.String localGroupId ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localGroupIdTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getGroupId(){
+                               return localGroupId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param GroupId
+                               */
+                               public void setGroupId(java.lang.String param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localGroupIdTracker = true;
+                                       } else {
+                                          localGroupIdTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localGroupId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for GroupName
+                        */
+
+                        
+                                    protected java.lang.String localGroupName ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localGroupNameTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getGroupName(){
+                               return localGroupName;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param GroupName
+                               */
+                               public void setGroupName(java.lang.String param){
+                            
+                                clearAllSettingTrackers();
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localGroupNameTracker = true;
+                                       } else {
+                                          localGroupNameTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localGroupName=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AuthorizeSecurityGroupIngressTypeChoice_type0.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AuthorizeSecurityGroupIngressTypeChoice_type0",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AuthorizeSecurityGroupIngressTypeChoice_type0",
+                           xmlWriter);
+                   }
+
+               
+                   }
+                if (localGroupIdTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"groupId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"groupId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("groupId");
+                                    }
+                                
+
+                                          if (localGroupId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("groupId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localGroupId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localGroupNameTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"groupName", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"groupName");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("groupName");
+                                    }
+                                
+
+                                          if (localGroupName==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("groupName cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localGroupName);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                 if (localGroupIdTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "groupId"));
+                                 
+                                        if (localGroupId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localGroupId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("groupId cannot be null!!");
+                                        }
+                                    } if (localGroupNameTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "groupName"));
+                                 
+                                        if (localGroupName != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localGroupName));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("groupName cannot be null!!");
+                                        }
+                                    }
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AuthorizeSecurityGroupIngressTypeChoice_type0 parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AuthorizeSecurityGroupIngressTypeChoice_type0 object =
+                new AuthorizeSecurityGroupIngressTypeChoice_type0();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setGroupId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                        else
+                                    
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupName").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setGroupName(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
index 8f6ed87..bc19c12 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AvailabilityZoneItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AvailabilityZoneItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -250,7 +234,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AvailabilityZoneItemType",
@@ -264,7 +248,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -298,7 +282,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -332,7 +316,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -369,7 +353,7 @@
                                             if (localMessageSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("messageSet cannot be null!!");
                                             }
-                                           localMessageSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","messageSet"),
+                                           localMessageSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","messageSet"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -534,7 +518,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "zoneName"));
                                  
                                         if (localZoneName != null){
@@ -543,7 +527,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("zoneName cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "zoneState"));
                                  
                                         if (localZoneState != null){
@@ -552,7 +536,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("zoneState cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "regionName"));
                                  
                                         if (localRegionName != null){
@@ -561,7 +545,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("regionName cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "messageSet"));
                             
                             
@@ -648,7 +632,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","zoneName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","zoneName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -667,7 +651,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","zoneState").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","zoneState").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -686,7 +670,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","regionName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","regionName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -705,7 +689,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","messageSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","messageSet").equals(reader.getName())){
                                 
                                                 object.setMessageSet(com.amazon.ec2.AvailabilityZoneMessageSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
index ebe77ff..6b57ae6 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AvailabilityZoneMessageSetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AvailabilityZoneMessageSetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AvailabilityZoneMessageSetType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.AvailabilityZoneMessageType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
index eb6a468..a34a9f0 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AvailabilityZoneMessageType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AvailabilityZoneMessageType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AvailabilityZoneMessageType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "message"));
                                  
                                         if (localMessage != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","message").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","message").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
index 520ccd9..fa39a82 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AvailabilityZoneSetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = AvailabilityZoneSetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":AvailabilityZoneSetType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.AvailabilityZoneItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
index 1fecf0b..aad2dda 100644
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
+++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BlockDeviceMappingItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = BlockDeviceMappingItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":BlockDeviceMappingItemType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -405,7 +389,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "deviceName"));
                                  
                                         if (localDeviceName != null){
@@ -414,7 +398,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("deviceName cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "BlockDeviceMappingItemTypeChoice_type0"));
                             
                             
@@ -501,7 +485,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","deviceName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","deviceName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
index 0cf664e..4a0225a 100644
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BlockDeviceMappingItemTypeChoice_type0.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = BlockDeviceMappingItemTypeChoice_type0
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -260,7 +244,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":BlockDeviceMappingItemTypeChoice_type0",
@@ -274,7 +258,7 @@
                
                    }
                 if (localVirtualNameTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -311,13 +295,13 @@
                                             if (localEbs==null){
                                                  throw new org.apache.axis2.databinding.ADBException("ebs cannot be null!!");
                                             }
-                                           localEbs.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ebs"),
+                                           localEbs.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ebs"),
                                                factory,xmlWriter);
                                         } if (localNoDeviceTracker){
                                             if (localNoDevice==null){
                                                  throw new org.apache.axis2.databinding.ADBException("noDevice cannot be null!!");
                                             }
-                                           localNoDevice.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","noDevice"),
+                                           localNoDevice.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","noDevice"),
                                                factory,xmlWriter);
                                         }
 
@@ -480,7 +464,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                  if (localVirtualNameTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "virtualName"));
                                  
                                         if (localVirtualName != null){
@@ -489,7 +473,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("virtualName cannot be null!!");
                                         }
                                     } if (localEbsTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "ebs"));
                             
                             
@@ -498,7 +482,7 @@
                                     }
                                     elementList.add(localEbs);
                                 } if (localNoDeviceTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "noDevice"));
                             
                             
@@ -553,7 +537,7 @@
                 
 
                  
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","virtualName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","virtualName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -566,7 +550,7 @@
                                 
                                         else
                                     
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ebs").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ebs").equals(reader.getName())){
                                 
                                                 object.setEbs(com.amazon.ec2.EbsBlockDeviceType.Factory.parse(reader));
                                               
@@ -576,7 +560,7 @@
                                 
                                         else
                                     
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","noDevice").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","noDevice").equals(reader.getName())){
                                 
                                                 object.setNoDevice(com.amazon.ec2.EmptyElementType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
index c7cc8a8..1e75282 100644
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
+++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BlockDeviceMappingType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = BlockDeviceMappingType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":BlockDeviceMappingType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.BlockDeviceMappingItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BundleInstance.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstance.java b/awsapi/src/com/amazon/ec2/BundleInstance.java
index 703ac0d..57050c1 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstance.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstance.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BundleInstance.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "BundleInstance",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","BundleInstance").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","BundleInstance").equals(reader.getName())){
                                 
                                                 object.setBundleInstance(com.amazon.ec2.BundleInstanceType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java b/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
index 348f8dd..5265f87 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BundleInstanceResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "BundleInstanceResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","BundleInstanceResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","BundleInstanceResponse").equals(reader.getName())){
                                 
                                                 object.setBundleInstanceResponse(com.amazon.ec2.BundleInstanceResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java b/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
index 8348c00..42123ad 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BundleInstanceResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = BundleInstanceResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":BundleInstanceResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localBundleInstanceTask==null){
                                                  throw new org.apache.axis2.databinding.ADBException("bundleInstanceTask cannot be null!!");
                                             }
-                                           localBundleInstanceTask.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundleInstanceTask"),
+                                           localBundleInstanceTask.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundleInstanceTask"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bundleInstanceTask"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundleInstanceTask").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundleInstanceTask").equals(reader.getName())){
                                 
                                                 object.setBundleInstanceTask(com.amazon.ec2.BundleInstanceTaskType.Factory.parse(reader));
                                               


[52/71] [abbrv] git commit: updated refs/heads/master to 26af71b

Posted by li...@apache.org.
CLOUDSTACK-1444. Modified services.xml. [Support for EC2 API version 2012-08-15]

Signed-off-by: Likitha Shetty <li...@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2570b667
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2570b667
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2570b667

Branch: refs/heads/master
Commit: 2570b6675609f2a69084468be418b6e8cf3df5bf
Parents: 33df54e
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Jun 27 16:33:57 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Jul 4 10:01:34 2013 +0530

----------------------------------------------------------------------
 awsapi/resource/AmazonEC2/services.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2570b667/awsapi/resource/AmazonEC2/services.xml
----------------------------------------------------------------------
diff --git a/awsapi/resource/AmazonEC2/services.xml b/awsapi/resource/AmazonEC2/services.xml
index 45f8cad..bc494ab 100644
--- a/awsapi/resource/AmazonEC2/services.xml
+++ b/awsapi/resource/AmazonEC2/services.xml
@@ -2,11 +2,11 @@
 <!-- This file was auto-generated from WSDL -->
 <!-- by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:00:16 CEST) -->
 <serviceGroup>
-    <service name="AmazonEC2">
+    <service name="AmazonEC2" class="com.cloud.bridge.lifecycle.ServiceEngineLifecycle">
         <messageReceivers>
             <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out" class="com.amazon.ec2.AmazonEC2MessageReceiverInOut"/>
         </messageReceivers>
-        <parameter name="ServiceClass">com.amazon.ec2.AmazonEC2Skeleton</parameter>
+        <parameter name="ServiceClass">com.cloud.bridge.service.EC2SoapService</parameter>
         <parameter name="useOriginalwsdl">true</parameter>
         <parameter name="modifyUserWSDLPortAddress">true</parameter>
         <operation name="DescribePlacementGroups" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">


[47/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
index f552780..912485d 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * AmazonEC2MessageReceiverInOut.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:00 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:00:16 CEST)
  */
         package com.amazon.ec2;
 
@@ -52,1752 +36,5406 @@
 
         
 
-            if("registerImage".equals(methodName)){
-                
-                com.amazon.ec2.RegisterImageResponse registerImageResponse191 = null;
-	                        com.amazon.ec2.RegisterImage wrappedParam =
-                                                             (com.amazon.ec2.RegisterImage)fromOM(
-                                    msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.RegisterImage.class,
-                                    getEnvelopeNamespaces(msgContext.getEnvelope()));
-                                                
-                                               registerImageResponse191 =
-                                                   
-                                                   
-                                                         skel.registerImage(wrappedParam)
-                                                    ;
-                                            
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), registerImageResponse191, false);
-                                    } else 
-
-            if("deleteTags".equals(methodName)){
+            if("describePlacementGroups".equals(methodName)){
                 
-                com.amazon.ec2.DeleteTagsResponse deleteTagsResponse193 = null;
-	                        com.amazon.ec2.DeleteTags wrappedParam =
-                                                             (com.amazon.ec2.DeleteTags)fromOM(
+                com.amazon.ec2.DescribePlacementGroupsResponse describePlacementGroupsResponse289 = null;
+	                        com.amazon.ec2.DescribePlacementGroups wrappedParam =
+                                                             (com.amazon.ec2.DescribePlacementGroups)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DeleteTags.class,
+                                    com.amazon.ec2.DescribePlacementGroups.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               deleteTagsResponse193 =
+                                               describePlacementGroupsResponse289 =
                                                    
                                                    
-                                                         skel.deleteTags(wrappedParam)
+                                                         skel.describePlacementGroups(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), deleteTagsResponse193, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describePlacementGroupsResponse289, false);
                                     } else 
 
-            if("createKeyPair".equals(methodName)){
+            if("createSecurityGroup".equals(methodName)){
                 
-                com.amazon.ec2.CreateKeyPairResponse createKeyPairResponse195 = null;
-	                        com.amazon.ec2.CreateKeyPair wrappedParam =
-                                                             (com.amazon.ec2.CreateKeyPair)fromOM(
+                com.amazon.ec2.CreateSecurityGroupResponse createSecurityGroupResponse291 = null;
+	                        com.amazon.ec2.CreateSecurityGroup wrappedParam =
+                                                             (com.amazon.ec2.CreateSecurityGroup)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.CreateKeyPair.class,
+                                    com.amazon.ec2.CreateSecurityGroup.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               createKeyPairResponse195 =
+                                               createSecurityGroupResponse291 =
                                                    
                                                    
-                                                         skel.createKeyPair(wrappedParam)
+                                                         skel.createSecurityGroup(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), createKeyPairResponse195, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), createSecurityGroupResponse291, false);
                                     } else 
 
-            if("terminateInstances".equals(methodName)){
+            if("resetNetworkInterfaceAttribute".equals(methodName)){
                 
-                com.amazon.ec2.TerminateInstancesResponse terminateInstancesResponse197 = null;
-	                        com.amazon.ec2.TerminateInstances wrappedParam =
-                                                             (com.amazon.ec2.TerminateInstances)fromOM(
+                com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttributeResponse293 = null;
+	                        com.amazon.ec2.ResetNetworkInterfaceAttribute wrappedParam =
+                                                             (com.amazon.ec2.ResetNetworkInterfaceAttribute)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.TerminateInstances.class,
+                                    com.amazon.ec2.ResetNetworkInterfaceAttribute.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               terminateInstancesResponse197 =
+                                               resetNetworkInterfaceAttributeResponse293 =
                                                    
                                                    
-                                                         skel.terminateInstances(wrappedParam)
+                                                         skel.resetNetworkInterfaceAttribute(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), terminateInstancesResponse197, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), resetNetworkInterfaceAttributeResponse293, false);
                                     } else 
 
-            if("describeImageAttribute".equals(methodName)){
+            if("createDhcpOptions".equals(methodName)){
                 
-                com.amazon.ec2.DescribeImageAttributeResponse describeImageAttributeResponse199 = null;
-	                        com.amazon.ec2.DescribeImageAttribute wrappedParam =
-                                                             (com.amazon.ec2.DescribeImageAttribute)fromOM(
+                com.amazon.ec2.CreateDhcpOptionsResponse createDhcpOptionsResponse295 = null;
+	                        com.amazon.ec2.CreateDhcpOptions wrappedParam =
+                                                             (com.amazon.ec2.CreateDhcpOptions)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeImageAttribute.class,
+                                    com.amazon.ec2.CreateDhcpOptions.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeImageAttributeResponse199 =
+                                               createDhcpOptionsResponse295 =
                                                    
                                                    
-                                                         skel.describeImageAttribute(wrappedParam)
+                                                         skel.createDhcpOptions(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeImageAttributeResponse199, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), createDhcpOptionsResponse295, false);
                                     } else 
 
-            if("describeSecurityGroups".equals(methodName)){
+            if("createRouteTable".equals(methodName)){
                 
-                com.amazon.ec2.DescribeSecurityGroupsResponse describeSecurityGroupsResponse201 = null;
-	                        com.amazon.ec2.DescribeSecurityGroups wrappedParam =
-                                                             (com.amazon.ec2.DescribeSecurityGroups)fromOM(
+                com.amazon.ec2.CreateRouteTableResponse createRouteTableResponse297 = null;
+	                        com.amazon.ec2.CreateRouteTable wrappedParam =
+                                                             (com.amazon.ec2.CreateRouteTable)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeSecurityGroups.class,
+                                    com.amazon.ec2.CreateRouteTable.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeSecurityGroupsResponse201 =
+                                               createRouteTableResponse297 =
                                                    
                                                    
-                                                         skel.describeSecurityGroups(wrappedParam)
+                                                         skel.createRouteTable(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeSecurityGroupsResponse201, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), createRouteTableResponse297, false);
                                     } else 
 
-            if("describePlacementGroups".equals(methodName)){
+            if("describeSubnets".equals(methodName)){
                 
-                com.amazon.ec2.DescribePlacementGroupsResponse describePlacementGroupsResponse203 = null;
-	                        com.amazon.ec2.DescribePlacementGroups wrappedParam =
-                                                             (com.amazon.ec2.DescribePlacementGroups)fromOM(
+                com.amazon.ec2.DescribeSubnetsResponse describeSubnetsResponse299 = null;
+	                        com.amazon.ec2.DescribeSubnets wrappedParam =
+                                                             (com.amazon.ec2.DescribeSubnets)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribePlacementGroups.class,
+                                    com.amazon.ec2.DescribeSubnets.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describePlacementGroupsResponse203 =
+                                               describeSubnetsResponse299 =
                                                    
                                                    
-                                                         skel.describePlacementGroups(wrappedParam)
+                                                         skel.describeSubnets(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describePlacementGroupsResponse203, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeSubnetsResponse299, false);
                                     } else 
 
-            if("createVpnConnection".equals(methodName)){
+            if("deactivateLicense".equals(methodName)){
                 
-                com.amazon.ec2.CreateVpnConnectionResponse createVpnConnectionResponse205 = null;
-	                        com.amazon.ec2.CreateVpnConnection wrappedParam =
-                                                             (com.amazon.ec2.CreateVpnConnection)fromOM(
+                com.amazon.ec2.DeactivateLicenseResponse deactivateLicenseResponse301 = null;
+	                        com.amazon.ec2.DeactivateLicense wrappedParam =
+                                                             (com.amazon.ec2.DeactivateLicense)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.CreateVpnConnection.class,
+                                    com.amazon.ec2.DeactivateLicense.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               createVpnConnectionResponse205 =
+                                               deactivateLicenseResponse301 =
                                                    
                                                    
-                                                         skel.createVpnConnection(wrappedParam)
+                                                         skel.deactivateLicense(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), createVpnConnectionResponse205, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), deactivateLicenseResponse301, false);
                                     } else 
 
-            if("attachVpnGateway".equals(methodName)){
+            if("deleteVpc".equals(methodName)){
                 
-                com.amazon.ec2.AttachVpnGatewayResponse attachVpnGatewayResponse207 = null;
-	                        com.amazon.ec2.AttachVpnGateway wrappedParam =
-                                                             (com.amazon.ec2.AttachVpnGateway)fromOM(
+                com.amazon.ec2.DeleteVpcResponse deleteVpcResponse303 = null;
+	                        com.amazon.ec2.DeleteVpc wrappedParam =
+                                                             (com.amazon.ec2.DeleteVpc)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.AttachVpnGateway.class,
+                                    com.amazon.ec2.DeleteVpc.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               attachVpnGatewayResponse207 =
+                                               deleteVpcResponse303 =
                                                    
                                                    
-                                                         skel.attachVpnGateway(wrappedParam)
+                                                         skel.deleteVpc(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), attachVpnGatewayResponse207, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpcResponse303, false);
                                     } else 
 
-            if("createVolume".equals(methodName)){
+            if("cancelSpotInstanceRequests".equals(methodName)){
                 
-                com.amazon.ec2.CreateVolumeResponse createVolumeResponse209 = null;
-	                        com.amazon.ec2.CreateVolume wrappedParam =
-                                                             (com.amazon.ec2.CreateVolume)fromOM(
+                com.amazon.ec2.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequestsResponse305 = null;
+	                        com.amazon.ec2.CancelSpotInstanceRequests wrappedParam =
+                                                             (com.amazon.ec2.CancelSpotInstanceRequests)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.CreateVolume.class,
+                                    com.amazon.ec2.CancelSpotInstanceRequests.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               createVolumeResponse209 =
+                                               cancelSpotInstanceRequestsResponse305 =
                                                    
                                                    
-                                                         skel.createVolume(wrappedParam)
+                                                         skel.cancelSpotInstanceRequests(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), createVolumeResponse209, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), cancelSpotInstanceRequestsResponse305, false);
                                     } else 
 
-            if("releaseAddress".equals(methodName)){
+            if("createSubnet".equals(methodName)){
                 
-                com.amazon.ec2.ReleaseAddressResponse releaseAddressResponse211 = null;
-	                        com.amazon.ec2.ReleaseAddress wrappedParam =
-                                                             (com.amazon.ec2.ReleaseAddress)fromOM(
+                com.amazon.ec2.CreateSubnetResponse createSubnetResponse307 = null;
+	                        com.amazon.ec2.CreateSubnet wrappedParam =
+                                                             (com.amazon.ec2.CreateSubnet)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.ReleaseAddress.class,
+                                    com.amazon.ec2.CreateSubnet.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               releaseAddressResponse211 =
+                                               createSubnetResponse307 =
                                                    
                                                    
-                                                         skel.releaseAddress(wrappedParam)
+                                                         skel.createSubnet(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), releaseAddressResponse211, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), createSubnetResponse307, false);
                                     } else 
 
-            if("describeRegions".equals(methodName)){
+            if("deleteVpnGateway".equals(methodName)){
                 
-                com.amazon.ec2.DescribeRegionsResponse describeRegionsResponse213 = null;
-	                        com.amazon.ec2.DescribeRegions wrappedParam =
-                                                             (com.amazon.ec2.DescribeRegions)fromOM(
+                com.amazon.ec2.DeleteVpnGatewayResponse deleteVpnGatewayResponse309 = null;
+	                        com.amazon.ec2.DeleteVpnGateway wrappedParam =
+                                                             (com.amazon.ec2.DeleteVpnGateway)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeRegions.class,
+                                    com.amazon.ec2.DeleteVpnGateway.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeRegionsResponse213 =
+                                               deleteVpnGatewayResponse309 =
                                                    
                                                    
-                                                         skel.describeRegions(wrappedParam)
+                                                         skel.deleteVpnGateway(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeRegionsResponse213, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnGatewayResponse309, false);
                                     } else 
 
-            if("deleteSubnet".equals(methodName)){
+            if("createNetworkAclEntry".equals(methodName)){
                 
-                com.amazon.ec2.DeleteSubnetResponse deleteSubnetResponse215 = null;
-	                        com.amazon.ec2.DeleteSubnet wrappedParam =
-                                                             (com.amazon.ec2.DeleteSubnet)fromOM(
+                com.amazon.ec2.CreateNetworkAclEntryResponse createNetworkAclEntryResponse311 = null;
+	                        com.amazon.ec2.CreateNetworkAclEntry wrappedParam =
+                                                             (com.amazon.ec2.CreateNetworkAclEntry)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DeleteSubnet.class,
+                                    com.amazon.ec2.CreateNetworkAclEntry.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               deleteSubnetResponse215 =
+                                               createNetworkAclEntryResponse311 =
                                                    
                                                    
-                                                         skel.deleteSubnet(wrappedParam)
+                                                         skel.createNetworkAclEntry(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), deleteSubnetResponse215, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkAclEntryResponse311, false);
                                     } else 
 
-            if("describeVpcs".equals(methodName)){
+            if("requestSpotInstances".equals(methodName)){
                 
-                com.amazon.ec2.DescribeVpcsResponse describeVpcsResponse217 = null;
-	                        com.amazon.ec2.DescribeVpcs wrappedParam =
-                                                             (com.amazon.ec2.DescribeVpcs)fromOM(
+                com.amazon.ec2.RequestSpotInstancesResponse requestSpotInstancesResponse313 = null;
+	                        com.amazon.ec2.RequestSpotInstances wrappedParam =
+                                                             (com.amazon.ec2.RequestSpotInstances)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeVpcs.class,
+                                    com.amazon.ec2.RequestSpotInstances.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeVpcsResponse217 =
+                                               requestSpotInstancesResponse313 =
                                                    
                                                    
-                                                         skel.describeVpcs(wrappedParam)
+                                                         skel.requestSpotInstances(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeVpcsResponse217, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), requestSpotInstancesResponse313, false);
                                     } else 
 
-            if("describeSpotPriceHistory".equals(methodName)){
+            if("describeVolumeAttribute".equals(methodName)){
                 
-                com.amazon.ec2.DescribeSpotPriceHistoryResponse describeSpotPriceHistoryResponse219 = null;
-	                        com.amazon.ec2.DescribeSpotPriceHistory wrappedParam =
-                                                             (com.amazon.ec2.DescribeSpotPriceHistory)fromOM(
+                com.amazon.ec2.DescribeVolumeAttributeResponse describeVolumeAttributeResponse315 = null;
+	                        com.amazon.ec2.DescribeVolumeAttribute wrappedParam =
+                                                             (com.amazon.ec2.DescribeVolumeAttribute)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeSpotPriceHistory.class,
+                                    com.amazon.ec2.DescribeVolumeAttribute.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeSpotPriceHistoryResponse219 =
+                                               describeVolumeAttributeResponse315 =
                                                    
                                                    
-                                                         skel.describeSpotPriceHistory(wrappedParam)
+                                                         skel.describeVolumeAttribute(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotPriceHistoryResponse219, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumeAttributeResponse315, false);
                                     } else 
 
-            if("describeReservedInstances".equals(methodName)){
+            if("associateDhcpOptions".equals(methodName)){
                 
-                com.amazon.ec2.DescribeReservedInstancesResponse describeReservedInstancesResponse221 = null;
-	                        com.amazon.ec2.DescribeReservedInstances wrappedParam =
-                                                             (com.amazon.ec2.DescribeReservedInstances)fromOM(
+                com.amazon.ec2.AssociateDhcpOptionsResponse associateDhcpOptionsResponse317 = null;
+	                        com.amazon.ec2.AssociateDhcpOptions wrappedParam =
+                                                             (com.amazon.ec2.AssociateDhcpOptions)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeReservedInstances.class,
+                                    com.amazon.ec2.AssociateDhcpOptions.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeReservedInstancesResponse221 =
+                                               associateDhcpOptionsResponse317 =
                                                    
                                                    
-                                                         skel.describeReservedInstances(wrappedParam)
+                                                         skel.associateDhcpOptions(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesResponse221, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), associateDhcpOptionsResponse317, false);
                                     } else 
 
             if("describeTags".equals(methodName)){
                 
-                com.amazon.ec2.DescribeTagsResponse describeTagsResponse223 = null;
+                com.amazon.ec2.DescribeTagsResponse describeTagsResponse319 = null;
 	                        com.amazon.ec2.DescribeTags wrappedParam =
                                                              (com.amazon.ec2.DescribeTags)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
                                     com.amazon.ec2.DescribeTags.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeTagsResponse223 =
+                                               describeTagsResponse319 =
                                                    
                                                    
                                                          skel.describeTags(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeTagsResponse223, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeTagsResponse319, false);
                                     } else 
 
-            if("importVolume".equals(methodName)){
+            if("importKeyPair".equals(methodName)){
                 
-                com.amazon.ec2.ImportVolumeResponse importVolumeResponse225 = null;
-	                        com.amazon.ec2.ImportVolume wrappedParam =
-                                                             (com.amazon.ec2.ImportVolume)fromOM(
+                com.amazon.ec2.ImportKeyPairResponse importKeyPairResponse321 = null;
+	                        com.amazon.ec2.ImportKeyPair wrappedParam =
+                                                             (com.amazon.ec2.ImportKeyPair)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.ImportVolume.class,
+                                    com.amazon.ec2.ImportKeyPair.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               importVolumeResponse225 =
+                                               importKeyPairResponse321 =
                                                    
                                                    
-                                                         skel.importVolume(wrappedParam)
+                                                         skel.importKeyPair(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), importVolumeResponse225, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), importKeyPairResponse321, false);
                                     } else 
 
-            if("describeSpotDatafeedSubscription".equals(methodName)){
+            if("deleteNetworkInterface".equals(methodName)){
                 
-                com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscriptionResponse227 = null;
-	                        com.amazon.ec2.DescribeSpotDatafeedSubscription wrappedParam =
-                                                             (com.amazon.ec2.DescribeSpotDatafeedSubscription)fromOM(
+                com.amazon.ec2.DeleteNetworkInterfaceResponse deleteNetworkInterfaceResponse323 = null;
+	                        com.amazon.ec2.DeleteNetworkInterface wrappedParam =
+                                                             (com.amazon.ec2.DeleteNetworkInterface)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeSpotDatafeedSubscription.class,
+                                    com.amazon.ec2.DeleteNetworkInterface.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeSpotDatafeedSubscriptionResponse227 =
+                                               deleteNetworkInterfaceResponse323 =
                                                    
                                                    
-                                                         skel.describeSpotDatafeedSubscription(wrappedParam)
+                                                         skel.deleteNetworkInterface(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotDatafeedSubscriptionResponse227, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkInterfaceResponse323, false);
                                     } else 
 
-            if("deactivateLicense".equals(methodName)){
+            if("describeVpcs".equals(methodName)){
                 
-                com.amazon.ec2.DeactivateLicenseResponse deactivateLicenseResponse229 = null;
-	                        com.amazon.ec2.DeactivateLicense wrappedParam =
-                                                             (com.amazon.ec2.DeactivateLicense)fromOM(
+                com.amazon.ec2.DescribeVpcsResponse describeVpcsResponse325 = null;
+	                        com.amazon.ec2.DescribeVpcs wrappedParam =
+                                                             (com.amazon.ec2.DescribeVpcs)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DeactivateLicense.class,
+                                    com.amazon.ec2.DescribeVpcs.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               deactivateLicenseResponse229 =
+                                               describeVpcsResponse325 =
                                                    
                                                    
-                                                         skel.deactivateLicense(wrappedParam)
+                                                         skel.describeVpcs(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), deactivateLicenseResponse229, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeVpcsResponse325, false);
                                     } else 
 
-            if("detachVolume".equals(methodName)){
+            if("describeLicenses".equals(methodName)){
                 
-                com.amazon.ec2.DetachVolumeResponse detachVolumeResponse231 = null;
-	                        com.amazon.ec2.DetachVolume wrappedParam =
-                                                             (com.amazon.ec2.DetachVolume)fromOM(
+                com.amazon.ec2.DescribeLicensesResponse describeLicensesResponse327 = null;
+	                        com.amazon.ec2.DescribeLicenses wrappedParam =
+                                                             (com.amazon.ec2.DescribeLicenses)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DetachVolume.class,
+                                    com.amazon.ec2.DescribeLicenses.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               detachVolumeResponse231 =
+                                               describeLicensesResponse327 =
                                                    
                                                    
-                                                         skel.detachVolume(wrappedParam)
+                                                         skel.describeLicenses(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), detachVolumeResponse231, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeLicensesResponse327, false);
                                     } else 
 
-            if("describeReservedInstancesOfferings".equals(methodName)){
+            if("bundleInstance".equals(methodName)){
                 
-                com.amazon.ec2.DescribeReservedInstancesOfferingsResponse describeReservedInstancesOfferingsResponse233 = null;
-	                        com.amazon.ec2.DescribeReservedInstancesOfferings wrappedParam =
-                                                             (com.amazon.ec2.DescribeReservedInstancesOfferings)fromOM(
+                com.amazon.ec2.BundleInstanceResponse bundleInstanceResponse329 = null;
+	                        com.amazon.ec2.BundleInstance wrappedParam =
+                                                             (com.amazon.ec2.BundleInstance)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeReservedInstancesOfferings.class,
+                                    com.amazon.ec2.BundleInstance.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeReservedInstancesOfferingsResponse233 =
+                                               bundleInstanceResponse329 =
                                                    
                                                    
-                                                         skel.describeReservedInstancesOfferings(wrappedParam)
+                                                         skel.bundleInstance(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesOfferingsResponse233, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), bundleInstanceResponse329, false);
                                     } else 
 
-            if("describeConversionTasks".equals(methodName)){
+            if("describeVpnConnections".equals(methodName)){
                 
-                com.amazon.ec2.DescribeConversionTasksResponse describeConversionTasksResponse235 = null;
-	                        com.amazon.ec2.DescribeConversionTasks wrappedParam =
-                                                             (com.amazon.ec2.DescribeConversionTasks)fromOM(
+                com.amazon.ec2.DescribeVpnConnectionsResponse describeVpnConnectionsResponse331 = null;
+	                        com.amazon.ec2.DescribeVpnConnections wrappedParam =
+                                                             (com.amazon.ec2.DescribeVpnConnections)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeConversionTasks.class,
+                                    com.amazon.ec2.DescribeVpnConnections.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeConversionTasksResponse235 =
+                                               describeVpnConnectionsResponse331 =
                                                    
                                                    
-                                                         skel.describeConversionTasks(wrappedParam)
+                                                         skel.describeVpnConnections(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeConversionTasksResponse235, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeVpnConnectionsResponse331, false);
                                     } else 
 
-            if("deleteCustomerGateway".equals(methodName)){
+            if("describeImages".equals(methodName)){
                 
-                com.amazon.ec2.DeleteCustomerGatewayResponse deleteCustomerGatewayResponse237 = null;
-	                        com.amazon.ec2.DeleteCustomerGateway wrappedParam =
-                                                             (com.amazon.ec2.DeleteCustomerGateway)fromOM(
+                com.amazon.ec2.DescribeImagesResponse describeImagesResponse333 = null;
+	                        com.amazon.ec2.DescribeImages wrappedParam =
+                                                             (com.amazon.ec2.DescribeImages)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DeleteCustomerGateway.class,
+                                    com.amazon.ec2.DescribeImages.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               deleteCustomerGatewayResponse237 =
+                                               describeImagesResponse333 =
                                                    
                                                    
-                                                         skel.deleteCustomerGateway(wrappedParam)
+                                                         skel.describeImages(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), deleteCustomerGatewayResponse237, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeImagesResponse333, false);
                                     } else 
 
-            if("deletePlacementGroup".equals(methodName)){
+            if("createInternetGateway".equals(methodName)){
                 
-                com.amazon.ec2.DeletePlacementGroupResponse deletePlacementGroupResponse239 = null;
-	                        com.amazon.ec2.DeletePlacementGroup wrappedParam =
-                                                             (com.amazon.ec2.DeletePlacementGroup)fromOM(
+                com.amazon.ec2.CreateInternetGatewayResponse createInternetGatewayResponse335 = null;
+	                        com.amazon.ec2.CreateInternetGateway wrappedParam =
+                                                             (com.amazon.ec2.CreateInternetGateway)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DeletePlacementGroup.class,
+                                    com.amazon.ec2.CreateInternetGateway.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               deletePlacementGroupResponse239 =
+                                               createInternetGatewayResponse335 =
                                                    
                                                    
-                                                         skel.deletePlacementGroup(wrappedParam)
+                                                         skel.createInternetGateway(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), deletePlacementGroupResponse239, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), createInternetGatewayResponse335, false);
                                     } else 
 
-            if("requestSpotInstances".equals(methodName)){
+            if("disassociateRouteTable".equals(methodName)){
                 
-                com.amazon.ec2.RequestSpotInstancesResponse requestSpotInstancesResponse241 = null;
-	                        com.amazon.ec2.RequestSpotInstances wrappedParam =
-                                                             (com.amazon.ec2.RequestSpotInstances)fromOM(
+                com.amazon.ec2.DisassociateRouteTableResponse disassociateRouteTableResponse337 = null;
+	                        com.amazon.ec2.DisassociateRouteTable wrappedParam =
+                                                             (com.amazon.ec2.DisassociateRouteTable)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.RequestSpotInstances.class,
+                                    com.amazon.ec2.DisassociateRouteTable.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               requestSpotInstancesResponse241 =
+                                               disassociateRouteTableResponse337 =
                                                    
                                                    
-                                                         skel.requestSpotInstances(wrappedParam)
+                                                         skel.disassociateRouteTable(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), requestSpotInstancesResponse241, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), disassociateRouteTableResponse337, false);
                                     } else 
 
-            if("confirmProductInstance".equals(methodName)){
+            if("replaceNetworkAclEntry".equals(methodName)){
                 
-                com.amazon.ec2.ConfirmProductInstanceResponse confirmProductInstanceResponse243 = null;
-	                        com.amazon.ec2.ConfirmProductInstance wrappedParam =
-                                                             (com.amazon.ec2.ConfirmProductInstance)fromOM(
+                com.amazon.ec2.ReplaceNetworkAclEntryResponse replaceNetworkAclEntryResponse339 = null;
+	                        com.amazon.ec2.ReplaceNetworkAclEntry wrappedParam =
+                                                             (com.amazon.ec2.ReplaceNetworkAclEntry)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.ConfirmProductInstance.class,
+                                    com.amazon.ec2.ReplaceNetworkAclEntry.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               confirmProductInstanceResponse243 =
+                                               replaceNetworkAclEntryResponse339 =
                                                    
                                                    
-                                                         skel.confirmProductInstance(wrappedParam)
+                                                         skel.replaceNetworkAclEntry(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), confirmProductInstanceResponse243, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), replaceNetworkAclEntryResponse339, false);
                                     } else 
 
-            if("modifySnapshotAttribute".equals(methodName)){
+            if("authorizeSecurityGroupIngress".equals(methodName)){
                 
-                com.amazon.ec2.ModifySnapshotAttributeResponse modifySnapshotAttributeResponse245 = null;
-	                        com.amazon.ec2.ModifySnapshotAttribute wrappedParam =
-                                                             (com.amazon.ec2.ModifySnapshotAttribute)fromOM(
+                com.amazon.ec2.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngressResponse341 = null;
+	                        com.amazon.ec2.AuthorizeSecurityGroupIngress wrappedParam =
+                                                             (com.amazon.ec2.AuthorizeSecurityGroupIngress)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.ModifySnapshotAttribute.class,
+                                    com.amazon.ec2.AuthorizeSecurityGroupIngress.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               modifySnapshotAttributeResponse245 =
+                                               authorizeSecurityGroupIngressResponse341 =
                                                    
                                                    
-                                                         skel.modifySnapshotAttribute(wrappedParam)
+                                                         skel.authorizeSecurityGroupIngress(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), modifySnapshotAttributeResponse245, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), authorizeSecurityGroupIngressResponse341, false);
                                     } else 
 
-            if("purchaseReservedInstancesOffering".equals(methodName)){
+            if("describeSnapshotAttribute".equals(methodName)){
                 
-                com.amazon.ec2.PurchaseReservedInstancesOfferingResponse purchaseReservedInstancesOfferingResponse247 = null;
-	                        com.amazon.ec2.PurchaseReservedInstancesOffering wrappedParam =
-                                                             (com.amazon.ec2.PurchaseReservedInstancesOffering)fromOM(
+                com.amazon.ec2.DescribeSnapshotAttributeResponse describeSnapshotAttributeResponse343 = null;
+	                        com.amazon.ec2.DescribeSnapshotAttribute wrappedParam =
+                                                             (com.amazon.ec2.DescribeSnapshotAttribute)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.PurchaseReservedInstancesOffering.class,
+                                    com.amazon.ec2.DescribeSnapshotAttribute.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               purchaseReservedInstancesOfferingResponse247 =
+                                               describeSnapshotAttributeResponse343 =
                                                    
                                                    
-                                                         skel.purchaseReservedInstancesOffering(wrappedParam)
+                                                         skel.describeSnapshotAttribute(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), purchaseReservedInstancesOfferingResponse247, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeSnapshotAttributeResponse343, false);
                                     } else 
 
-            if("cancelConversionTask".equals(methodName)){
+            if("createVpnGateway".equals(methodName)){
                 
-                com.amazon.ec2.CancelConversionTaskResponse cancelConversionTaskResponse249 = null;
-	                        com.amazon.ec2.CancelConversionTask wrappedParam =
-                                                             (com.amazon.ec2.CancelConversionTask)fromOM(
+                com.amazon.ec2.CreateVpnGatewayResponse createVpnGatewayResponse345 = null;
+	                        com.amazon.ec2.CreateVpnGateway wrappedParam =
+                                                             (com.amazon.ec2.CreateVpnGateway)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.CancelConversionTask.class,
+                                    com.amazon.ec2.CreateVpnGateway.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               cancelConversionTaskResponse249 =
+                                               createVpnGatewayResponse345 =
                                                    
                                                    
-                                                         skel.cancelConversionTask(wrappedParam)
+                                                         skel.createVpnGateway(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), cancelConversionTaskResponse249, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), createVpnGatewayResponse345, false);
                                     } else 
 
-            if("deleteVpnConnection".equals(methodName)){
+            if("resetInstanceAttribute".equals(methodName)){
                 
-                com.amazon.ec2.DeleteVpnConnectionResponse deleteVpnConnectionResponse251 = null;
-	                        com.amazon.ec2.DeleteVpnConnection wrappedParam =
-                                                             (com.amazon.ec2.DeleteVpnConnection)fromOM(
+                com.amazon.ec2.ResetInstanceAttributeResponse resetInstanceAttributeResponse347 = null;
+	                        com.amazon.ec2.ResetInstanceAttribute wrappedParam =
+                                                             (com.amazon.ec2.ResetInstanceAttribute)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DeleteVpnConnection.class,
+                                    com.amazon.ec2.ResetInstanceAttribute.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               deleteVpnConnectionResponse251 =
+                                               resetInstanceAttributeResponse347 =
                                                    
                                                    
-                                                         skel.deleteVpnConnection(wrappedParam)
+                                                         skel.resetInstanceAttribute(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnConnectionResponse251, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), resetInstanceAttributeResponse347, false);
                                     } else 
 
-            if("detachVpnGateway".equals(methodName)){
+            if("createTags".equals(methodName)){
                 
-                com.amazon.ec2.DetachVpnGatewayResponse detachVpnGatewayResponse253 = null;
-	                        com.amazon.ec2.DetachVpnGateway wrappedParam =
-                                                             (com.amazon.ec2.DetachVpnGateway)fromOM(
+                com.amazon.ec2.CreateTagsResponse createTagsResponse349 = null;
+	                        com.amazon.ec2.CreateTags wrappedParam =
+                                                             (com.amazon.ec2.CreateTags)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DetachVpnGateway.class,
+                                    com.amazon.ec2.CreateTags.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               detachVpnGatewayResponse253 =
+                                               createTagsResponse349 =
                                                    
                                                    
-                                                         skel.detachVpnGateway(wrappedParam)
+                                                         skel.createTags(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), detachVpnGatewayResponse253, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), createTagsResponse349, false);
                                     } else 
 
-            if("describeCustomerGateways".equals(methodName)){
+            if("authorizeSecurityGroupEgress".equals(methodName)){
                 
-                com.amazon.ec2.DescribeCustomerGatewaysResponse describeCustomerGatewaysResponse255 = null;
-	                        com.amazon.ec2.DescribeCustomerGateways wrappedParam =
-                                                             (com.amazon.ec2.DescribeCustomerGateways)fromOM(
+                com.amazon.ec2.AuthorizeSecurityGroupEgressResponse authorizeSecurityGroupEgressResponse351 = null;
+	                        com.amazon.ec2.AuthorizeSecurityGroupEgress wrappedParam =
+                                                             (com.amazon.ec2.AuthorizeSecurityGroupEgress)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeCustomerGateways.class,
+                                    com.amazon.ec2.AuthorizeSecurityGroupEgress.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeCustomerGatewaysResponse255 =
+                                               authorizeSecurityGroupEgressResponse351 =
                                                    
                                                    
-                                                         skel.describeCustomerGateways(wrappedParam)
+                                                         skel.authorizeSecurityGroupEgress(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeCustomerGatewaysResponse255, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), authorizeSecurityGroupEgressResponse351, false);
                                     } else 
 
-            if("describeLicenses".equals(methodName)){
+            if("associateAddress".equals(methodName)){
                 
-                com.amazon.ec2.DescribeLicensesResponse describeLicensesResponse257 = null;
-	                        com.amazon.ec2.DescribeLicenses wrappedParam =
-                                                             (com.amazon.ec2.DescribeLicenses)fromOM(
+                com.amazon.ec2.AssociateAddressResponse associateAddressResponse353 = null;
+	                        com.amazon.ec2.AssociateAddress wrappedParam =
+                                                             (com.amazon.ec2.AssociateAddress)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeLicenses.class,
+                                    com.amazon.ec2.AssociateAddress.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeLicensesResponse257 =
+                                               associateAddressResponse353 =
                                                    
                                                    
-                                                         skel.describeLicenses(wrappedParam)
+                                                         skel.associateAddress(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeLicensesResponse257, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), associateAddressResponse353, false);
                                     } else 
 
-            if("revokeSecurityGroupIngress".equals(methodName)){
+            if("describeImageAttribute".equals(methodName)){
                 
-                com.amazon.ec2.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngressResponse259 = null;
-	                        com.amazon.ec2.RevokeSecurityGroupIngress wrappedParam =
-                                                             (com.amazon.ec2.RevokeSecurityGroupIngress)fromOM(
+                com.amazon.ec2.DescribeImageAttributeResponse describeImageAttributeResponse355 = null;
+	                        com.amazon.ec2.DescribeImageAttribute wrappedParam =
+                                                             (com.amazon.ec2.DescribeImageAttribute)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.RevokeSecurityGroupIngress.class,
+                                    com.amazon.ec2.DescribeImageAttribute.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               revokeSecurityGroupIngressResponse259 =
+                                               describeImageAttributeResponse355 =
                                                    
                                                    
-                                                         skel.revokeSecurityGroupIngress(wrappedParam)
+                                                         skel.describeImageAttribute(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), revokeSecurityGroupIngressResponse259, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeImageAttributeResponse355, false);
                                     } else 
 
-            if("describeSubnets".equals(methodName)){
+            if("describeSpotPriceHistory".equals(methodName)){
                 
-                com.amazon.ec2.DescribeSubnetsResponse describeSubnetsResponse261 = null;
-	                        com.amazon.ec2.DescribeSubnets wrappedParam =
-                                                             (com.amazon.ec2.DescribeSubnets)fromOM(
+                com.amazon.ec2.DescribeSpotPriceHistoryResponse describeSpotPriceHistoryResponse357 = null;
+	                        com.amazon.ec2.DescribeSpotPriceHistory wrappedParam =
+                                                             (com.amazon.ec2.DescribeSpotPriceHistory)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeSubnets.class,
+                                    com.amazon.ec2.DescribeSpotPriceHistory.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeSubnetsResponse261 =
+                                               describeSpotPriceHistoryResponse357 =
                                                    
                                                    
-                                                         skel.describeSubnets(wrappedParam)
+                                                         skel.describeSpotPriceHistory(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeSubnetsResponse261, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotPriceHistoryResponse357, false);
                                     } else 
 
-            if("resetSnapshotAttribute".equals(methodName)){
+            if("modifySnapshotAttribute".equals(methodName)){
                 
-                com.amazon.ec2.ResetSnapshotAttributeResponse resetSnapshotAttributeResponse263 = null;
-	                        com.amazon.ec2.ResetSnapshotAttribute wrappedParam =
-                                                             (com.amazon.ec2.ResetSnapshotAttribute)fromOM(
+                com.amazon.ec2.ModifySnapshotAttributeResponse modifySnapshotAttributeResponse359 = null;
+	                        com.amazon.ec2.ModifySnapshotAttribute wrappedParam =
+                                                             (com.amazon.ec2.ModifySnapshotAttribute)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.ResetSnapshotAttribute.class,
+                                    com.amazon.ec2.ModifySnapshotAttribute.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               resetSnapshotAttributeResponse263 =
+                                               modifySnapshotAttributeResponse359 =
                                                    
                                                    
-                                                         skel.resetSnapshotAttribute(wrappedParam)
+                                                         skel.modifySnapshotAttribute(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), resetSnapshotAttributeResponse263, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), modifySnapshotAttributeResponse359, false);
                                     } else 
 
-            if("describeAddresses".equals(methodName)){
+            if("describeSpotInstanceRequests".equals(methodName)){
                 
-                com.amazon.ec2.DescribeAddressesResponse describeAddressesResponse265 = null;
-	                        com.amazon.ec2.DescribeAddresses wrappedParam =
-                                                             (com.amazon.ec2.DescribeAddresses)fromOM(
+                com.amazon.ec2.DescribeSpotInstanceRequestsResponse describeSpotInstanceRequestsResponse361 = null;
+	                        com.amazon.ec2.DescribeSpotInstanceRequests wrappedParam =
+                                                             (com.amazon.ec2.DescribeSpotInstanceRequests)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeAddresses.class,
+                                    com.amazon.ec2.DescribeSpotInstanceRequests.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeAddressesResponse265 =
+                                               describeSpotInstanceRequestsResponse361 =
                                                    
                                                    
-                                                         skel.describeAddresses(wrappedParam)
+                                                         skel.describeSpotInstanceRequests(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeAddressesResponse265, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotInstanceRequestsResponse361, false);
                                     } else 
 
-            if("createSecurityGroup".equals(methodName)){
+            if("importInstance".equals(methodName)){
                 
-                com.amazon.ec2.CreateSecurityGroupResponse createSecurityGroupResponse267 = null;
-	                        com.amazon.ec2.CreateSecurityGroup wrappedParam =
-                                                             (com.amazon.ec2.CreateSecurityGroup)fromOM(
+                com.amazon.ec2.ImportInstanceResponse importInstanceResponse363 = null;
+	                        com.amazon.ec2.ImportInstance wrappedParam =
+                                                             (com.amazon.ec2.ImportInstance)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.CreateSecurityGroup.class,
+                                    com.amazon.ec2.ImportInstance.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               createSecurityGroupResponse267 =
+                                               importInstanceResponse363 =
                                                    
                                                    
-                                                         skel.createSecurityGroup(wrappedParam)
+                                                         skel.importInstance(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), createSecurityGroupResponse267, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), importInstanceResponse363, false);
                                     } else 
 
-            if("allocateAddress".equals(methodName)){
+            if("describeKeyPairs".equals(methodName)){
                 
-                com.amazon.ec2.AllocateAddressResponse allocateAddressResponse269 = null;
-	                        com.amazon.ec2.AllocateAddress wrappedParam =
-                                                             (com.amazon.ec2.AllocateAddress)fromOM(
+                com.amazon.ec2.DescribeKeyPairsResponse describeKeyPairsResponse365 = null;
+	                        com.amazon.ec2.DescribeKeyPairs wrappedParam =
+                                                             (com.amazon.ec2.DescribeKeyPairs)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.AllocateAddress.class,
+                                    com.amazon.ec2.DescribeKeyPairs.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               allocateAddressResponse269 =
+                                               describeKeyPairsResponse365 =
                                                    
                                                    
-                                                         skel.allocateAddress(wrappedParam)
+                                                         skel.describeKeyPairs(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), allocateAddressResponse269, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeKeyPairsResponse365, false);
                                     } else 
 
-            if("importKeyPair".equals(methodName)){
+            if("revokeSecurityGroupIngress".equals(methodName)){
                 
-                com.amazon.ec2.ImportKeyPairResponse importKeyPairResponse271 = null;
-	                        com.amazon.ec2.ImportKeyPair wrappedParam =
-                                                             (com.amazon.ec2.ImportKeyPair)fromOM(
+                com.amazon.ec2.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngressResponse367 = null;
+	                        com.amazon.ec2.RevokeSecurityGroupIngress wrappedParam =
+                                                             (com.amazon.ec2.RevokeSecurityGroupIngress)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.ImportKeyPair.class,
+                                    com.amazon.ec2.RevokeSecurityGroupIngress.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               importKeyPairResponse271 =
+                                               revokeSecurityGroupIngressResponse367 =
                                                    
                                                    
-                                                         skel.importKeyPair(wrappedParam)
+                                                         skel.revokeSecurityGroupIngress(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), importKeyPairResponse271, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), revokeSecurityGroupIngressResponse367, false);
                                     } else 
 
-            if("createTags".equals(methodName)){
+            if("createPlacementGroup".equals(methodName)){
                 
-                com.amazon.ec2.CreateTagsResponse createTagsResponse273 = null;
-	                        com.amazon.ec2.CreateTags wrappedParam =
-                                                             (com.amazon.ec2.CreateTags)fromOM(
+                com.amazon.ec2.CreatePlacementGroupResponse createPlacementGroupResponse369 = null;
+	                        com.amazon.ec2.CreatePlacementGroup wrappedParam =
+                                                             (com.amazon.ec2.CreatePlacementGroup)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.CreateTags.class,
+                                    com.amazon.ec2.CreatePlacementGroup.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               createTagsResponse273 =
+                                               createPlacementGroupResponse369 =
                                                    
                                                    
-                                                         skel.createTags(wrappedParam)
+                                                         skel.createPlacementGroup(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), createTagsResponse273, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), createPlacementGroupResponse369, false);
                                     } else 
 
-            if("startInstances".equals(methodName)){
+            if("deleteNetworkAclEntry".equals(methodName)){
                 
-                com.amazon.ec2.StartInstancesResponse startInstancesResponse275 = null;
-	                        com.amazon.ec2.StartInstances wrappedParam =
-                                                             (com.amazon.ec2.StartInstances)fromOM(
+                com.amazon.ec2.DeleteNetworkAclEntryResponse deleteNetworkAclEntryResponse371 = null;
+	                        com.amazon.ec2.DeleteNetworkAclEntry wrappedParam =
+                                                             (com.amazon.ec2.DeleteNetworkAclEntry)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.StartInstances.class,
+                                    com.amazon.ec2.DeleteNetworkAclEntry.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               startInstancesResponse275 =
+                                               deleteNetworkAclEntryResponse371 =
                                                    
                                                    
-                                                         skel.startInstances(wrappedParam)
+                                                         skel.deleteNetworkAclEntry(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), startInstancesResponse275, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkAclEntryResponse371, false);
                                     } else 
 
-            if("describeVpnConnections".equals(methodName)){
+            if("activateLicense".equals(methodName)){
                 
-                com.amazon.ec2.DescribeVpnConnectionsResponse describeVpnConnectionsResponse277 = null;
-	                        com.amazon.ec2.DescribeVpnConnections wrappedParam =
-                                                             (com.amazon.ec2.DescribeVpnConnections)fromOM(
+                com.amazon.ec2.ActivateLicenseResponse activateLicenseResponse373 = null;
+	                        com.amazon.ec2.ActivateLicense wrappedParam =
+                                                             (com.amazon.ec2.ActivateLicense)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeVpnConnections.class,
+                                    com.amazon.ec2.ActivateLicense.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               describeVpnConnectionsResponse277 =
+                                               activateLicenseResponse373 =
                                                    
                                                    
-                                                         skel.describeVpnConnections(wrappedParam)
+                                                         skel.activateLicense(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), describeVpnConnectionsResponse277, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), activateLicenseResponse373, false);
                                     } else 
 
-            if("rebootInstances".equals(methodName)){
+            if("deleteRouteTable".equals(methodName)){
                 
-                com.amazon.ec2.RebootInstancesResponse rebootInstancesResponse279 = null;
-	                        com.amazon.ec2.RebootInstances wrappedParam =
-                                                             (com.amazon.ec2.RebootInstances)fromOM(
+                com.amazon.ec2.DeleteRouteTableResponse deleteRouteTableResponse375 = null;
+	                        com.amazon.ec2.DeleteRouteTable wrappedParam =
+                                                             (com.amazon.ec2.DeleteRouteTable)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.RebootInstances.class,
+                                    com.amazon.ec2.DeleteRouteTable.class,
                                     getEnvelopeNamespaces(msgContext.getEnvelope()));
                                                 
-                                               rebootInstancesResponse279 =
+                                               deleteRouteTableResponse375 =
                                                    
                                                    
-                                                         skel.rebootInstances(wrappedParam)
+                                                         skel.deleteRouteTable(wrappedParam)
                                                     ;
                                             
-                                        envelope = toEnvelope(getSOAPFactory(msgContext), rebootInstancesResponse279, false);
+                                        envelope = toEnvelope(getSOAPFactory(msgContext), deleteRouteTableResponse375, false);
                                     } else 
 
-            if("describeAvailabilityZones".equals(methodName)){
+            if("unmonitorInstances".equals(methodName)){
                 
-                com.amazon.ec2.DescribeAvailabilityZonesResponse describeAvailabilityZonesResponse281 = null;
-	                        com.amazon.ec2.DescribeAvailabilityZones wrappedParam =
-                                                             (com.amazon.ec2.DescribeAvailabilityZones)fromOM(
+                com.amazon.ec2.UnmonitorInstancesResponse unmonitorInstancesResponse377 = null;
+	                        com.amazon.ec2.UnmonitorInstances wrappedParam =
+                                                             (com.amazon.ec2.UnmonitorInstances)fromOM(
                                     msgContext.getEnvelope().getBody().getFirstElement(),
-                                    com.amazon.ec2.DescribeAvailabilityZones.class,
+                                    com.amazon.ec2.UnmonitorInstances.class,
                                     getEnvelope

<TRUNCATED>

[39/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
new file mode 100644
index 0000000..05282b8
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
@@ -0,0 +1,575 @@
+
+/**
+ * AttachInternetGatewayType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AttachInternetGatewayType bean class
+            */
+        
+        public  class AttachInternetGatewayType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AttachInternetGatewayType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for InternetGatewayId
+                        */
+
+                        
+                                    protected java.lang.String localInternetGatewayId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getInternetGatewayId(){
+                               return localInternetGatewayId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param InternetGatewayId
+                               */
+                               public void setInternetGatewayId(java.lang.String param){
+                            
+                                            this.localInternetGatewayId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for VpcId
+                        */
+
+                        
+                                    protected java.lang.String localVpcId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getVpcId(){
+                               return localVpcId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param VpcId
+                               */
+                               public void setVpcId(java.lang.String param){
+                            
+                                            this.localVpcId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AttachInternetGatewayType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AttachInternetGatewayType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AttachInternetGatewayType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"internetGatewayId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"internetGatewayId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("internetGatewayId");
+                                    }
+                                
+
+                                          if (localInternetGatewayId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("internetGatewayId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localInternetGatewayId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"vpcId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"vpcId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("vpcId");
+                                    }
+                                
+
+                                          if (localVpcId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("vpcId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localVpcId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "internetGatewayId"));
+                                 
+                                        if (localInternetGatewayId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localInternetGatewayId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("internetGatewayId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "vpcId"));
+                                 
+                                        if (localVpcId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVpcId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("vpcId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AttachInternetGatewayType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AttachInternetGatewayType object =
+                new AttachInternetGatewayType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AttachInternetGatewayType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AttachInternetGatewayType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","internetGatewayId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setInternetGatewayId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpcId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setVpcId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
new file mode 100644
index 0000000..594d420
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
@@ -0,0 +1,362 @@
+
+/**
+ * AttachNetworkInterface.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AttachNetworkInterface bean class
+            */
+        
+        public  class AttachNetworkInterface
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "AttachNetworkInterface",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AttachNetworkInterface
+                        */
+
+                        
+                                    protected com.amazon.ec2.AttachNetworkInterfaceType localAttachNetworkInterface ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AttachNetworkInterfaceType
+                           */
+                           public  com.amazon.ec2.AttachNetworkInterfaceType getAttachNetworkInterface(){
+                               return localAttachNetworkInterface;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AttachNetworkInterface
+                               */
+                               public void setAttachNetworkInterface(com.amazon.ec2.AttachNetworkInterfaceType param){
+                            
+                                            this.localAttachNetworkInterface=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AttachNetworkInterface.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localAttachNetworkInterface==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localAttachNetworkInterface.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localAttachNetworkInterface.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AttachNetworkInterface parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AttachNetworkInterface object =
+                new AttachNetworkInterface();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AttachNetworkInterface").equals(reader.getName())){
+                                
+                                                object.setAttachNetworkInterface(com.amazon.ec2.AttachNetworkInterfaceType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
new file mode 100644
index 0000000..1575e33
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * AttachNetworkInterfaceResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AttachNetworkInterfaceResponse bean class
+            */
+        
+        public  class AttachNetworkInterfaceResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "AttachNetworkInterfaceResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AttachNetworkInterfaceResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.AttachNetworkInterfaceResponseType localAttachNetworkInterfaceResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AttachNetworkInterfaceResponseType
+                           */
+                           public  com.amazon.ec2.AttachNetworkInterfaceResponseType getAttachNetworkInterfaceResponse(){
+                               return localAttachNetworkInterfaceResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AttachNetworkInterfaceResponse
+                               */
+                               public void setAttachNetworkInterfaceResponse(com.amazon.ec2.AttachNetworkInterfaceResponseType param){
+                            
+                                            this.localAttachNetworkInterfaceResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AttachNetworkInterfaceResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localAttachNetworkInterfaceResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localAttachNetworkInterfaceResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localAttachNetworkInterfaceResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AttachNetworkInterfaceResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AttachNetworkInterfaceResponse object =
+                new AttachNetworkInterfaceResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AttachNetworkInterfaceResponse").equals(reader.getName())){
+                                
+                                                object.setAttachNetworkInterfaceResponse(com.amazon.ec2.AttachNetworkInterfaceResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
new file mode 100644
index 0000000..4993c45
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
@@ -0,0 +1,575 @@
+
+/**
+ * AttachNetworkInterfaceResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AttachNetworkInterfaceResponseType bean class
+            */
+        
+        public  class AttachNetworkInterfaceResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AttachNetworkInterfaceResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for AttachmentId
+                        */
+
+                        
+                                    protected java.lang.String localAttachmentId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getAttachmentId(){
+                               return localAttachmentId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AttachmentId
+                               */
+                               public void setAttachmentId(java.lang.String param){
+                            
+                                            this.localAttachmentId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AttachNetworkInterfaceResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AttachNetworkInterfaceResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AttachNetworkInterfaceResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"attachmentId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"attachmentId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("attachmentId");
+                                    }
+                                
+
+                                          if (localAttachmentId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("attachmentId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localAttachmentId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "attachmentId"));
+                                 
+                                        if (localAttachmentId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAttachmentId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("attachmentId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AttachNetworkInterfaceResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AttachNetworkInterfaceResponseType object =
+                new AttachNetworkInterfaceResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AttachNetworkInterfaceResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AttachNetworkInterfaceResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","attachmentId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setAttachmentId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[34/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java b/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
index 3216488..98b57f8 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BundleInstanceS3StorageType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = BundleInstanceS3StorageType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -322,7 +306,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":BundleInstanceS3StorageType",
@@ -336,7 +320,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -404,7 +388,7 @@
                                     
                                    xmlWriter.writeEndElement();
                               if (localAwsAccessKeyIdTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -438,7 +422,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              } if (localUploadPolicyTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -472,7 +456,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              } if (localUploadPolicySignatureTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -668,7 +652,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bucket"));
                                  
                                         if (localBucket != null){
@@ -677,7 +661,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("bucket cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "prefix"));
                                  
                                         if (localPrefix != null){
@@ -686,7 +670,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("prefix cannot be null!!");
                                         }
                                      if (localAwsAccessKeyIdTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "awsAccessKeyId"));
                                  
                                         if (localAwsAccessKeyId != null){
@@ -695,7 +679,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("awsAccessKeyId cannot be null!!");
                                         }
                                     } if (localUploadPolicyTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "uploadPolicy"));
                                  
                                         if (localUploadPolicy != null){
@@ -704,7 +688,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("uploadPolicy cannot be null!!");
                                         }
                                     } if (localUploadPolicySignatureTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "uploadPolicySignature"));
                                  
                                         if (localUploadPolicySignature != null){
@@ -791,7 +775,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bucket").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bucket").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -810,7 +794,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","prefix").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","prefix").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -829,7 +813,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","awsAccessKeyId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","awsAccessKeyId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -847,7 +831,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","uploadPolicy").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","uploadPolicy").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -865,7 +849,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","uploadPolicySignature").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","uploadPolicySignature").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
index 5402ee8..8d2743d 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BundleInstanceTaskErrorType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = BundleInstanceTaskErrorType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":BundleInstanceTaskErrorType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -434,7 +418,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "code"));
                                  
                                         if (localCode != null){
@@ -443,7 +427,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("code cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "message"));
                                  
                                         if (localMessage != null){
@@ -530,7 +514,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","code").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","code").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +533,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","message").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","message").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
index 0e9b7b5..162d188 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BundleInstanceTaskStorageType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = BundleInstanceTaskStorageType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":BundleInstanceTaskStorageType",
@@ -177,7 +161,7 @@
                                             if (localS3==null){
                                                  throw new org.apache.axis2.databinding.ADBException("S3 cannot be null!!");
                                             }
-                                           localS3.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","S3"),
+                                           localS3.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","S3"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -342,7 +326,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "S3"));
                             
                             
@@ -429,7 +413,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","S3").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","S3").equals(reader.getName())){
                                 
                                                 object.setS3(com.amazon.ec2.BundleInstanceS3StorageType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
index c6bbb58..780861e 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BundleInstanceTaskType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = BundleInstanceTaskType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -398,7 +382,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":BundleInstanceTaskType",
@@ -412,7 +396,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -446,7 +430,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -480,7 +464,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -514,7 +498,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -548,7 +532,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -585,10 +569,10 @@
                                             if (localStorage==null){
                                                  throw new org.apache.axis2.databinding.ADBException("storage cannot be null!!");
                                             }
-                                           localStorage.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","storage"),
+                                           localStorage.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","storage"),
                                                factory,xmlWriter);
                                          if (localProgressTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -625,7 +609,7 @@
                                             if (localError==null){
                                                  throw new org.apache.axis2.databinding.ADBException("error cannot be null!!");
                                             }
-                                           localError.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","error"),
+                                           localError.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","error"),
                                                factory,xmlWriter);
                                         }
                     xmlWriter.writeEndElement();
@@ -790,7 +774,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "instanceId"));
                                  
                                         if (localInstanceId != null){
@@ -799,7 +783,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bundleId"));
                                  
                                         if (localBundleId != null){
@@ -808,7 +792,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("bundleId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "state"));
                                  
                                         if (localState != null){
@@ -817,7 +801,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("state cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "startTime"));
                                  
                                         if (localStartTime != null){
@@ -826,7 +810,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("startTime cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "updateTime"));
                                  
                                         if (localUpdateTime != null){
@@ -835,7 +819,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("updateTime cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "storage"));
                             
                             
@@ -844,7 +828,7 @@
                                     }
                                     elementList.add(localStorage);
                                  if (localProgressTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "progress"));
                                  
                                         if (localProgress != null){
@@ -853,7 +837,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("progress cannot be null!!");
                                         }
                                     } if (localErrorTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "error"));
                             
                             
@@ -940,7 +924,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","instanceId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -959,7 +943,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundleId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundleId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -978,7 +962,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","state").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","state").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -997,7 +981,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","startTime").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","startTime").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1016,7 +1000,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","updateTime").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","updateTime").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1035,7 +1019,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","storage").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","storage").equals(reader.getName())){
                                 
                                                 object.setStorage(com.amazon.ec2.BundleInstanceTaskStorageType.Factory.parse(reader));
                                               
@@ -1051,7 +1035,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","progress").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","progress").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -1069,7 +1053,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","error").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","error").equals(reader.getName())){
                                 
                                                 object.setError(com.amazon.ec2.BundleInstanceTaskErrorType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
index b6277f2..e7c6e88 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BundleInstanceTasksSetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = BundleInstanceTasksSetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":BundleInstanceTasksSetType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.BundleInstanceTaskType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/BundleInstanceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceType.java b/awsapi/src/com/amazon/ec2/BundleInstanceType.java
index c766b1e..c9c9be3 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * BundleInstanceType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = BundleInstanceType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":BundleInstanceType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localStorage==null){
                                                  throw new org.apache.axis2.databinding.ADBException("storage cannot be null!!");
                                             }
-                                           localStorage.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","storage"),
+                                           localStorage.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","storage"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "instanceId"));
                                  
                                         if (localInstanceId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "storage"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","instanceId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","storage").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","storage").equals(reader.getName())){
                                 
                                                 object.setStorage(com.amazon.ec2.BundleInstanceTaskStorageType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelBundleTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTask.java b/awsapi/src/com/amazon/ec2/CancelBundleTask.java
index 12dd586..e8e94b9 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTask.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTask.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelBundleTask.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CancelBundleTask",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CancelBundleTask").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CancelBundleTask").equals(reader.getName())){
                                 
                                                 object.setCancelBundleTask(com.amazon.ec2.CancelBundleTaskType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
index 7f7307a..64c0ab0 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelBundleTaskResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CancelBundleTaskResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CancelBundleTaskResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CancelBundleTaskResponse").equals(reader.getName())){
                                 
                                                 object.setCancelBundleTaskResponse(com.amazon.ec2.CancelBundleTaskResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
index 408cf0d..12352c7 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelBundleTaskResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CancelBundleTaskResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CancelBundleTaskResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localBundleInstanceTask==null){
                                                  throw new org.apache.axis2.databinding.ADBException("bundleInstanceTask cannot be null!!");
                                             }
-                                           localBundleInstanceTask.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundleInstanceTask"),
+                                           localBundleInstanceTask.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundleInstanceTask"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bundleInstanceTask"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundleInstanceTask").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundleInstanceTask").equals(reader.getName())){
                                 
                                                 object.setBundleInstanceTask(com.amazon.ec2.BundleInstanceTaskType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
index 303b2b5..9f46a6e 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelBundleTaskType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CancelBundleTaskType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CancelBundleTaskType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bundleId"));
                                  
                                         if (localBundleId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundleId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundleId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelConversionTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTask.java b/awsapi/src/com/amazon/ec2/CancelConversionTask.java
index 41ef6f9..70b0e6c 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTask.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTask.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelConversionTask.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CancelConversionTask",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CancelConversionTask").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CancelConversionTask").equals(reader.getName())){
                                 
                                                 object.setCancelConversionTask(com.amazon.ec2.CancelConversionTaskType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
index 8b6f062..bc091c7 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelConversionTaskResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CancelConversionTaskResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CancelConversionTaskResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CancelConversionTaskResponse").equals(reader.getName())){
                                 
                                                 object.setCancelConversionTaskResponse(com.amazon.ec2.CancelConversionTaskResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
index b1986ef..f42e914 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelConversionTaskResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CancelConversionTaskResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CancelConversionTaskResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     


[02/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
index f2202e7..a25dfa5 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAddressesResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeAddressesResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeAddressesResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localAddressesSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("addressesSet cannot be null!!");
                                             }
-                                           localAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","addressesSet"),
+                                           localAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","addressesSet"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "addressesSet"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","addressesSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","addressesSet").equals(reader.getName())){
                                 
                                                 object.setAddressesSet(com.amazon.ec2.DescribeAddressesResponseInfoType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
index bedeb29..1c48986 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAddressesType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeAddressesType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -78,6 +62,36 @@
                             
 
                         /**
+                        * field for AllocationIdsSet
+                        */
+
+                        
+                                    protected com.amazon.ec2.AllocationIdSetType localAllocationIdsSet ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AllocationIdSetType
+                           */
+                           public  com.amazon.ec2.AllocationIdSetType getAllocationIdsSet(){
+                               return localAllocationIdsSet;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AllocationIdsSet
+                               */
+                               public void setAllocationIdsSet(com.amazon.ec2.AllocationIdSetType param){
+                            
+                                            this.localAllocationIdsSet=param;
+                                    
+
+                               }
+                            
+
+                        /**
                         * field for FilterSet
                         */
 
@@ -204,7 +218,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeAddressesType",
@@ -221,13 +235,19 @@
                                             if (localPublicIpsSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("publicIpsSet cannot be null!!");
                                             }
-                                           localPublicIpsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","publicIpsSet"),
+                                           localPublicIpsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","publicIpsSet"),
+                                               factory,xmlWriter);
+                                        
+                                            if (localAllocationIdsSet==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("allocationIdsSet cannot be null!!");
+                                            }
+                                           localAllocationIdsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","allocationIdsSet"),
                                                factory,xmlWriter);
                                          if (localFilterSetTracker){
                                             if (localFilterSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("filterSet cannot be null!!");
                                             }
-                                           localFilterSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","filterSet"),
+                                           localFilterSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","filterSet"),
                                                factory,xmlWriter);
                                         }
                     xmlWriter.writeEndElement();
@@ -392,7 +412,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "publicIpsSet"));
                             
                             
@@ -400,8 +420,17 @@
                                          throw new org.apache.axis2.databinding.ADBException("publicIpsSet cannot be null!!");
                                     }
                                     elementList.add(localPublicIpsSet);
+                                
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "allocationIdsSet"));
+                            
+                            
+                                    if (localAllocationIdsSet==null){
+                                         throw new org.apache.axis2.databinding.ADBException("allocationIdsSet cannot be null!!");
+                                    }
+                                    elementList.add(localAllocationIdsSet);
                                  if (localFilterSetTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "filterSet"));
                             
                             
@@ -488,7 +517,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","publicIpsSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","publicIpsSet").equals(reader.getName())){
                                 
                                                 object.setPublicIpsSet(com.amazon.ec2.DescribeAddressesInfoType.Factory.parse(reader));
                                               
@@ -504,7 +533,23 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","filterSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","allocationIdsSet").equals(reader.getName())){
+                                
+                                                object.setAllocationIdsSet(com.amazon.ec2.AllocationIdSetType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","filterSet").equals(reader.getName())){
                                 
                                                 object.setFilterSet(com.amazon.ec2.FilterSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
index afee444..92f2262 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAvailabilityZones.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DescribeAvailabilityZones",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DescribeAvailabilityZones").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DescribeAvailabilityZones").equals(reader.getName())){
                                 
                                                 object.setDescribeAvailabilityZones(com.amazon.ec2.DescribeAvailabilityZonesType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
index 8420d0f..0a315d1 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAvailabilityZonesResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DescribeAvailabilityZonesResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DescribeAvailabilityZonesResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DescribeAvailabilityZonesResponse").equals(reader.getName())){
                                 
                                                 object.setDescribeAvailabilityZonesResponse(com.amazon.ec2.DescribeAvailabilityZonesResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
index 18782b1..f0a1a2a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAvailabilityZonesResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeAvailabilityZonesResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeAvailabilityZonesResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localAvailabilityZoneInfo==null){
                                                  throw new org.apache.axis2.databinding.ADBException("availabilityZoneInfo cannot be null!!");
                                             }
-                                           localAvailabilityZoneInfo.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","availabilityZoneInfo"),
+                                           localAvailabilityZoneInfo.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","availabilityZoneInfo"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "availabilityZoneInfo"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","availabilityZoneInfo").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","availabilityZoneInfo").equals(reader.getName())){
                                 
                                                 object.setAvailabilityZoneInfo(com.amazon.ec2.AvailabilityZoneSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
index 49cd89f..8fac028 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAvailabilityZonesSetItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeAvailabilityZonesSetItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeAvailabilityZonesSetItemType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "zoneName"));
                                  
                                         if (localZoneName != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","zoneName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","zoneName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
index 79891e5..8b1ac1c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAvailabilityZonesSetType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeAvailabilityZonesSetType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeAvailabilityZonesSetType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.DescribeAvailabilityZonesSetItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
index 50fd2a8..ec07779 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeAvailabilityZonesType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeAvailabilityZonesType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -204,7 +188,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeAvailabilityZonesType",
@@ -221,13 +205,13 @@
                                             if (localAvailabilityZoneSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("availabilityZoneSet cannot be null!!");
                                             }
-                                           localAvailabilityZoneSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","availabilityZoneSet"),
+                                           localAvailabilityZoneSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","availabilityZoneSet"),
                                                factory,xmlWriter);
                                          if (localFilterSetTracker){
                                             if (localFilterSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("filterSet cannot be null!!");
                                             }
-                                           localFilterSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","filterSet"),
+                                           localFilterSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","filterSet"),
                                                factory,xmlWriter);
                                         }
                     xmlWriter.writeEndElement();
@@ -392,7 +376,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "availabilityZoneSet"));
                             
                             
@@ -401,7 +385,7 @@
                                     }
                                     elementList.add(localAvailabilityZoneSet);
                                  if (localFilterSetTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "filterSet"));
                             
                             
@@ -488,7 +472,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","availabilityZoneSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","availabilityZoneSet").equals(reader.getName())){
                                 
                                                 object.setAvailabilityZoneSet(com.amazon.ec2.DescribeAvailabilityZonesSetType.Factory.parse(reader));
                                               
@@ -504,7 +488,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","filterSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","filterSet").equals(reader.getName())){
                                 
                                                 object.setFilterSet(com.amazon.ec2.FilterSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
index 6965279..df44af9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeBundleTasks.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DescribeBundleTasks",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DescribeBundleTasks").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DescribeBundleTasks").equals(reader.getName())){
                                 
                                                 object.setDescribeBundleTasks(com.amazon.ec2.DescribeBundleTasksType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
index 3d017a8..34f273f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeBundleTasksInfoType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeBundleTasksInfoType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -212,7 +196,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeBundleTasksInfoType",
@@ -229,7 +213,7 @@
                                        if (localItem!=null){
                                             for (int i = 0;i < localItem.length;i++){
                                                 if (localItem[i] != null){
-                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item"),
+                                                 localItem[i].serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item"),
                                                            factory,xmlWriter);
                                                 } else {
                                                    
@@ -410,7 +394,7 @@
                                  for (int i = 0;i < localItem.length;i++){
 
                                     if (localItem[i] != null){
-                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                         elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                           "item"));
                                          elementList.add(localItem[i]);
                                     } else {
@@ -507,7 +491,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                 
                                     
                                     
@@ -529,7 +513,7 @@
                                                                 //two continuous end elements means we are exiting the xml structure
                                                                 loopDone1 = true;
                                                             } else {
-                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","item").equals(reader.getName())){
+                                                                if (new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","item").equals(reader.getName())){
                                                                     list1.add(com.amazon.ec2.DescribeBundleTasksItemType.Factory.parse(reader));
                                                                         
                                                                 }else{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
index c85065d..c329b4b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeBundleTasksItemType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeBundleTasksItemType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeBundleTasksItemType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bundleId"));
                                  
                                         if (localBundleId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundleId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundleId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
index 7769cdc..13523ac 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeBundleTasksResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DescribeBundleTasksResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DescribeBundleTasksResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DescribeBundleTasksResponse").equals(reader.getName())){
                                 
                                                 object.setDescribeBundleTasksResponse(com.amazon.ec2.DescribeBundleTasksResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
index d989138..cc92e4e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeBundleTasksResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeBundleTasksResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeBundleTasksResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localBundleInstanceTasksSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("bundleInstanceTasksSet cannot be null!!");
                                             }
-                                           localBundleInstanceTasksSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundleInstanceTasksSet"),
+                                           localBundleInstanceTasksSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundleInstanceTasksSet"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bundleInstanceTasksSet"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundleInstanceTasksSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundleInstanceTasksSet").equals(reader.getName())){
                                 
                                                 object.setBundleInstanceTasksSet(com.amazon.ec2.BundleInstanceTasksSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
index 33e993c..09472bb 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeBundleTasksType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = DescribeBundleTasksType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -204,7 +188,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":DescribeBundleTasksType",
@@ -221,13 +205,13 @@
                                             if (localBundlesSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("bundlesSet cannot be null!!");
                                             }
-                                           localBundlesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundlesSet"),
+                                           localBundlesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundlesSet"),
                                                factory,xmlWriter);
                                          if (localFilterSetTracker){
                                             if (localFilterSet==null){
                                                  throw new org.apache.axis2.databinding.ADBException("filterSet cannot be null!!");
                                             }
-                                           localFilterSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","filterSet"),
+                                           localFilterSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","filterSet"),
                                                factory,xmlWriter);
                                         }
                     xmlWriter.writeEndElement();
@@ -392,7 +376,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "bundlesSet"));
                             
                             
@@ -401,7 +385,7 @@
                                     }
                                     elementList.add(localBundlesSet);
                                  if (localFilterSetTracker){
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "filterSet"));
                             
                             
@@ -488,7 +472,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bundlesSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bundlesSet").equals(reader.getName())){
                                 
                                                 object.setBundlesSet(com.amazon.ec2.DescribeBundleTasksInfoType.Factory.parse(reader));
                                               
@@ -504,7 +488,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","filterSet").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","filterSet").equals(reader.getName())){
                                 
                                                 object.setFilterSet(com.amazon.ec2.FilterSetType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
index 13aded0..e5eb8f2 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeConversionTasks.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DescribeConversionTasks",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DescribeConversionTasks").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DescribeConversionTasks").equals(reader.getName())){
                                 
                                                 object.setDescribeConversionTasks(com.amazon.ec2.DescribeConversionTasksType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
index 1e44de1..f23774d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * DescribeConversionTasksResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "DescribeConversionTasksResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","DescribeConversionTasksResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DescribeConversionTasksResponse").equals(reader.getName())){
                                 
                                                 object.setDescribeConversionTasksResponse(com.amazon.ec2.DescribeConversionTasksResponseType.Factory.parse(reader));
                                             


[22/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
index dac247c..6357026 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreatePlacementGroupType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreatePlacementGroupType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreatePlacementGroupType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -434,7 +418,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "groupName"));
                                  
                                         if (localGroupName != null){
@@ -443,7 +427,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("groupName cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "strategy"));
                                  
                                         if (localStrategy != null){
@@ -530,7 +514,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","groupName").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupName").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -549,7 +533,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","strategy").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","strategy").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
new file mode 100644
index 0000000..d512c7a
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateReservedInstancesListing.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateReservedInstancesListing bean class
+            */
+        
+        public  class CreateReservedInstancesListing
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateReservedInstancesListing",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateReservedInstancesListing
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateReservedInstancesListingType localCreateReservedInstancesListing ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateReservedInstancesListingType
+                           */
+                           public  com.amazon.ec2.CreateReservedInstancesListingType getCreateReservedInstancesListing(){
+                               return localCreateReservedInstancesListing;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateReservedInstancesListing
+                               */
+                               public void setCreateReservedInstancesListing(com.amazon.ec2.CreateReservedInstancesListingType param){
+                            
+                                            this.localCreateReservedInstancesListing=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateReservedInstancesListing.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateReservedInstancesListing==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateReservedInstancesListing.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateReservedInstancesListing.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateReservedInstancesListing parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateReservedInstancesListing object =
+                new CreateReservedInstancesListing();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateReservedInstancesListing").equals(reader.getName())){
+                                
+                                                object.setCreateReservedInstancesListing(com.amazon.ec2.CreateReservedInstancesListingType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
new file mode 100644
index 0000000..edbd653
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateReservedInstancesListingResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateReservedInstancesListingResponse bean class
+            */
+        
+        public  class CreateReservedInstancesListingResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateReservedInstancesListingResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateReservedInstancesListingResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateReservedInstancesListingResponseType localCreateReservedInstancesListingResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateReservedInstancesListingResponseType
+                           */
+                           public  com.amazon.ec2.CreateReservedInstancesListingResponseType getCreateReservedInstancesListingResponse(){
+                               return localCreateReservedInstancesListingResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateReservedInstancesListingResponse
+                               */
+                               public void setCreateReservedInstancesListingResponse(com.amazon.ec2.CreateReservedInstancesListingResponseType param){
+                            
+                                            this.localCreateReservedInstancesListingResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateReservedInstancesListingResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateReservedInstancesListingResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateReservedInstancesListingResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateReservedInstancesListingResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateReservedInstancesListingResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateReservedInstancesListingResponse object =
+                new CreateReservedInstancesListingResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateReservedInstancesListingResponse").equals(reader.getName())){
+                                
+                                                object.setCreateReservedInstancesListingResponse(com.amazon.ec2.CreateReservedInstancesListingResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
new file mode 100644
index 0000000..b4bdc91
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
@@ -0,0 +1,544 @@
+
+/**
+ * CreateReservedInstancesListingResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateReservedInstancesListingResponseType bean class
+            */
+        
+        public  class CreateReservedInstancesListingResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateReservedInstancesListingResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for ReservedInstancesListingsSet
+                        */
+
+                        
+                                    protected com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType localReservedInstancesListingsSet ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType
+                           */
+                           public  com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType getReservedInstancesListingsSet(){
+                               return localReservedInstancesListingsSet;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param ReservedInstancesListingsSet
+                               */
+                               public void setReservedInstancesListingsSet(com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType param){
+                            
+                                            this.localReservedInstancesListingsSet=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateReservedInstancesListingResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateReservedInstancesListingResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateReservedInstancesListingResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                            if (localReservedInstancesListingsSet==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!");
+                                            }
+                                           localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","reservedInstancesListingsSet"),
+                                               factory,xmlWriter);
+                                        
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "reservedInstancesListingsSet"));
+                            
+                            
+                                    if (localReservedInstancesListingsSet==null){
+                                         throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!");
+                                    }
+                                    elementList.add(localReservedInstancesListingsSet);
+                                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateReservedInstancesListingResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateReservedInstancesListingResponseType object =
+                new CreateReservedInstancesListingResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateReservedInstancesListingResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateReservedInstancesListingResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","reservedInstancesListingsSet").equals(reader.getName())){
+                                
+                                                object.setReservedInstancesListingsSet(com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[70/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
index c889c6e..9b1a561 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssignPrivateIpAddressesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
index dd2ead1..5426316 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssignPrivateIpAddressesSetItemRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
index bbad2f3..3c2d155 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssignPrivateIpAddressesSetRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
index c814860..9530b4c 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssignPrivateIpAddressesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddress.java b/awsapi/src/com/amazon/ec2/AssociateAddress.java
index 0a19632..69a65b5 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddress.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddress.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateAddress.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
index cc7d628..3773a7f 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateAddressResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
index df22008..eb4a7fa 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateAddressResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressType.java b/awsapi/src/com/amazon/ec2/AssociateAddressType.java
index 388d8f1..bf52b2b 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateAddressType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
index c9627b4..fecfb9d 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateAddressTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
index 4f0a7cd..ae0ea55 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateAddressTypeChoice_type1.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
index e6a0794..a65654a 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateDhcpOptions.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
index 0f5357b..c51ed0e 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateDhcpOptionsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
index da7d483..83a3c0d 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateDhcpOptionsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
index 0b45971..62dd5ce 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateDhcpOptionsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTable.java b/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
index c93393a..5d6b7d8 100644
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateRouteTable.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
index dd71521..05406a0 100644
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateRouteTableResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
index cd57ebf..e361b89 100644
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateRouteTableResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
index 0301c58..e59f497 100644
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateRouteTableType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGateway.java b/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
index 4ae3127..6b8ea68 100644
--- a/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachInternetGateway.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
index 7955e2a..afd5c50 100644
--- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachInternetGatewayResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
index d4edca6..4f21703 100644
--- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachInternetGatewayResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
index 05282b8..dd35f42 100644
--- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachInternetGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
index 594d420..3b46f09 100644
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachNetworkInterface.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
index 1575e33..33f7b3a 100644
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachNetworkInterfaceResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
index 4993c45..29eed5a 100644
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachNetworkInterfaceResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
index 81d0ed2..4a40720 100644
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachNetworkInterfaceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolume.java b/awsapi/src/com/amazon/ec2/AttachVolume.java
index 2e9b8f3..3fb3b95 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolume.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolume.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachVolume.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java b/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
index 46399ea..9301044 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachVolumeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java b/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
index aa4206a..61e39a4 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachVolumeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeType.java b/awsapi/src/com/amazon/ec2/AttachVolumeType.java
index 07ace9f..0b142d6 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolumeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachVolumeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGateway.java b/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
index 89ec7a8..9fa76a7 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachVpnGateway.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
index c6bf0de..80ce23b 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachVpnGatewayResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
index 9cb8b2a..5c12228 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachVpnGatewayResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
index af90c15..a77aadb 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachVpnGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java b/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
index 96bda4f..77b9a6f 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachmentSetItemResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java b/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
index cb92e59..5a6c8e8 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachmentSetResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachmentSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetType.java b/awsapi/src/com/amazon/ec2/AttachmentSetType.java
index a8dbda3..b5bd6b6 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentSetType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachmentSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentType.java b/awsapi/src/com/amazon/ec2/AttachmentType.java
index 592ae06..f2ce6a6 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttachmentType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java b/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
index 7fc0c6b..7e55197 100644
--- a/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
+++ b/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttributeBooleanValueType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AttributeValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttributeValueType.java b/awsapi/src/com/amazon/ec2/AttributeValueType.java
index 3c36a60..83e6466 100644
--- a/awsapi/src/com/amazon/ec2/AttributeValueType.java
+++ b/awsapi/src/com/amazon/ec2/AttributeValueType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AttributeValueType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
index 199a945..3858a6e 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AuthorizeSecurityGroupEgress.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
index 4f79081..211b89e 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AuthorizeSecurityGroupEgressResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
index 289fb81..60a61da 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AuthorizeSecurityGroupEgressResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
index 23cf27c..834fbff 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AuthorizeSecurityGroupEgressType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
index b2de2aa..217e54c 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AuthorizeSecurityGroupIngress.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
index 15923cf..34b7ec4 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AuthorizeSecurityGroupIngressResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
index 3752315..c72fe1e 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AuthorizeSecurityGroupIngressResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
index 886c9d6..67a3fc2 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AuthorizeSecurityGroupIngressType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
index 4155af0..930394c 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AuthorizeSecurityGroupIngressTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
index bc19c12..3ebb05a 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AvailabilityZoneItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
index 6b57ae6..0d9ccaa 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AvailabilityZoneMessageSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
index a34a9f0..99b3486 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AvailabilityZoneMessageType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
index fa39a82..f183d80 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AvailabilityZoneSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
index aad2dda..30b4ef2 100644
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
+++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BlockDeviceMappingItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
index 4a0225a..408395c 100644
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BlockDeviceMappingItemTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
index 1e75282..45c7224 100644
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
+++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BlockDeviceMappingType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BundleInstance.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstance.java b/awsapi/src/com/amazon/ec2/BundleInstance.java
index 57050c1..9828623 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstance.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstance.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BundleInstance.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java b/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
index 5265f87..daf980b 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BundleInstanceResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java b/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
index 42123ad..5deb6b2 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BundleInstanceResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java b/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
index 98b57f8..8191199 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BundleInstanceS3StorageType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
index 8d2743d..9cd820c 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BundleInstanceTaskErrorType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
index 162d188..ff26c55 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BundleInstanceTaskStorageType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
index 780861e..696fa8c 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BundleInstanceTaskType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
index e7c6e88..cf9f509 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BundleInstanceTasksSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/BundleInstanceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceType.java b/awsapi/src/com/amazon/ec2/BundleInstanceType.java
index c9c9be3..55c0e4c 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * BundleInstanceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelBundleTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTask.java b/awsapi/src/com/amazon/ec2/CancelBundleTask.java
index e8e94b9..0ba7b7f 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTask.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTask.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelBundleTask.java


[08/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java b/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
new file mode 100644
index 0000000..5d87b51
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteRouteResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteRouteResponse bean class
+            */
+        
+        public  class DeleteRouteResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteRouteResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteRouteResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteRouteResponseType localDeleteRouteResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteRouteResponseType
+                           */
+                           public  com.amazon.ec2.DeleteRouteResponseType getDeleteRouteResponse(){
+                               return localDeleteRouteResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteRouteResponse
+                               */
+                               public void setDeleteRouteResponse(com.amazon.ec2.DeleteRouteResponseType param){
+                            
+                                            this.localDeleteRouteResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteRouteResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteRouteResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteRouteResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteRouteResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteRouteResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteRouteResponse object =
+                new DeleteRouteResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteRouteResponse").equals(reader.getName())){
+                                
+                                                object.setDeleteRouteResponse(com.amazon.ec2.DeleteRouteResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java b/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
new file mode 100644
index 0000000..4f19f0e
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * DeleteRouteResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteRouteResponseType bean class
+            */
+        
+        public  class DeleteRouteResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteRouteResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteRouteResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteRouteResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteRouteResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteRouteResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteRouteResponseType object =
+                new DeleteRouteResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteRouteResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteRouteResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTable.java b/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
new file mode 100644
index 0000000..6588477
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteRouteTable.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteRouteTable bean class
+            */
+        
+        public  class DeleteRouteTable
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteRouteTable",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteRouteTable
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteRouteTableType localDeleteRouteTable ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteRouteTableType
+                           */
+                           public  com.amazon.ec2.DeleteRouteTableType getDeleteRouteTable(){
+                               return localDeleteRouteTable;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteRouteTable
+                               */
+                               public void setDeleteRouteTable(com.amazon.ec2.DeleteRouteTableType param){
+                            
+                                            this.localDeleteRouteTable=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteRouteTable.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteRouteTable==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteRouteTable.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteRouteTable.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteRouteTable parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteRouteTable object =
+                new DeleteRouteTable();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteRouteTable").equals(reader.getName())){
+                                
+                                                object.setDeleteRouteTable(com.amazon.ec2.DeleteRouteTableType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
new file mode 100644
index 0000000..b6ac3b7
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteRouteTableResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteRouteTableResponse bean class
+            */
+        
+        public  class DeleteRouteTableResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteRouteTableResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteRouteTableResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteRouteTableResponseType localDeleteRouteTableResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteRouteTableResponseType
+                           */
+                           public  com.amazon.ec2.DeleteRouteTableResponseType getDeleteRouteTableResponse(){
+                               return localDeleteRouteTableResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteRouteTableResponse
+                               */
+                               public void setDeleteRouteTableResponse(com.amazon.ec2.DeleteRouteTableResponseType param){
+                            
+                                            this.localDeleteRouteTableResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteRouteTableResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteRouteTableResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteRouteTableResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteRouteTableResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteRouteTableResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteRouteTableResponse object =
+                new DeleteRouteTableResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteRouteTableResponse").equals(reader.getName())){
+                                
+                                                object.setDeleteRouteTableResponse(com.amazon.ec2.DeleteRouteTableResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[23/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
new file mode 100644
index 0000000..52b2e62
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
@@ -0,0 +1,544 @@
+
+/**
+ * CreateNetworkInterfaceResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkInterfaceResponseType bean class
+            */
+        
+        public  class CreateNetworkInterfaceResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateNetworkInterfaceResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for NetworkInterface
+                        */
+
+                        
+                                    protected com.amazon.ec2.NetworkInterfaceType localNetworkInterface ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.NetworkInterfaceType
+                           */
+                           public  com.amazon.ec2.NetworkInterfaceType getNetworkInterface(){
+                               return localNetworkInterface;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkInterface
+                               */
+                               public void setNetworkInterface(com.amazon.ec2.NetworkInterfaceType param){
+                            
+                                            this.localNetworkInterface=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkInterfaceResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateNetworkInterfaceResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateNetworkInterfaceResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                            if (localNetworkInterface==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("networkInterface cannot be null!!");
+                                            }
+                                           localNetworkInterface.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkInterface"),
+                                               factory,xmlWriter);
+                                        
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkInterface"));
+                            
+                            
+                                    if (localNetworkInterface==null){
+                                         throw new org.apache.axis2.databinding.ADBException("networkInterface cannot be null!!");
+                                    }
+                                    elementList.add(localNetworkInterface);
+                                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkInterfaceResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkInterfaceResponseType object =
+                new CreateNetworkInterfaceResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateNetworkInterfaceResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateNetworkInterfaceResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkInterface").equals(reader.getName())){
+                                
+                                                object.setNetworkInterface(com.amazon.ec2.NetworkInterfaceType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
new file mode 100644
index 0000000..92b9dac
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
@@ -0,0 +1,941 @@
+
+/**
+ * CreateNetworkInterfaceType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateNetworkInterfaceType bean class
+            */
+        
+        public  class CreateNetworkInterfaceType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateNetworkInterfaceType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for SubnetId
+                        */
+
+                        
+                                    protected java.lang.String localSubnetId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getSubnetId(){
+                               return localSubnetId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param SubnetId
+                               */
+                               public void setSubnetId(java.lang.String param){
+                            
+                                            this.localSubnetId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for Description
+                        */
+
+                        
+                                    protected java.lang.String localDescription ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localDescriptionTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getDescription(){
+                               return localDescription;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Description
+                               */
+                               public void setDescription(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localDescriptionTracker = true;
+                                       } else {
+                                          localDescriptionTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localDescription=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for PrivateIpAddress
+                        */
+
+                        
+                                    protected java.lang.String localPrivateIpAddress ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localPrivateIpAddressTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getPrivateIpAddress(){
+                               return localPrivateIpAddress;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param PrivateIpAddress
+                               */
+                               public void setPrivateIpAddress(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localPrivateIpAddressTracker = true;
+                                       } else {
+                                          localPrivateIpAddressTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localPrivateIpAddress=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for GroupSet
+                        */
+
+                        
+                                    protected com.amazon.ec2.SecurityGroupIdSetType localGroupSet ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localGroupSetTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.SecurityGroupIdSetType
+                           */
+                           public  com.amazon.ec2.SecurityGroupIdSetType getGroupSet(){
+                               return localGroupSet;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param GroupSet
+                               */
+                               public void setGroupSet(com.amazon.ec2.SecurityGroupIdSetType param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localGroupSetTracker = true;
+                                       } else {
+                                          localGroupSetTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localGroupSet=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for PrivateIpAddressesSet
+                        */
+
+                        
+                                    protected com.amazon.ec2.PrivateIpAddressesSetRequestType localPrivateIpAddressesSet ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localPrivateIpAddressesSetTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.PrivateIpAddressesSetRequestType
+                           */
+                           public  com.amazon.ec2.PrivateIpAddressesSetRequestType getPrivateIpAddressesSet(){
+                               return localPrivateIpAddressesSet;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param PrivateIpAddressesSet
+                               */
+                               public void setPrivateIpAddressesSet(com.amazon.ec2.PrivateIpAddressesSetRequestType param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localPrivateIpAddressesSetTracker = true;
+                                       } else {
+                                          localPrivateIpAddressesSetTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localPrivateIpAddressesSet=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for SecondaryPrivateIpAddressCount
+                        */
+
+                        
+                                    protected int localSecondaryPrivateIpAddressCount ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localSecondaryPrivateIpAddressCountTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return int
+                           */
+                           public  int getSecondaryPrivateIpAddressCount(){
+                               return localSecondaryPrivateIpAddressCount;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param SecondaryPrivateIpAddressCount
+                               */
+                               public void setSecondaryPrivateIpAddressCount(int param){
+                            
+                                       // setting primitive attribute tracker to true
+                                       
+                                               if (param==java.lang.Integer.MIN_VALUE) {
+                                           localSecondaryPrivateIpAddressCountTracker = false;
+                                              
+                                       } else {
+                                          localSecondaryPrivateIpAddressCountTracker = true;
+                                       }
+                                   
+                                            this.localSecondaryPrivateIpAddressCount=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateNetworkInterfaceType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateNetworkInterfaceType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateNetworkInterfaceType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"subnetId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"subnetId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("subnetId");
+                                    }
+                                
+
+                                          if (localSubnetId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("subnetId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localSubnetId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                              if (localDescriptionTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"description", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"description");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("description");
+                                    }
+                                
+
+                                          if (localDescription==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("description cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localDescription);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localPrivateIpAddressTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"privateIpAddress", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"privateIpAddress");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("privateIpAddress");
+                                    }
+                                
+
+                                          if (localPrivateIpAddress==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("privateIpAddress cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localPrivateIpAddress);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localGroupSetTracker){
+                                            if (localGroupSet==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("groupSet cannot be null!!");
+                                            }
+                                           localGroupSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupSet"),
+                                               factory,xmlWriter);
+                                        } if (localPrivateIpAddressesSetTracker){
+                                            if (localPrivateIpAddressesSet==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("privateIpAddressesSet cannot be null!!");
+                                            }
+                                           localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","privateIpAddressesSet"),
+                                               factory,xmlWriter);
+                                        } if (localSecondaryPrivateIpAddressCountTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"secondaryPrivateIpAddressCount", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"secondaryPrivateIpAddressCount");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("secondaryPrivateIpAddressCount");
+                                    }
+                                
+                                               if (localSecondaryPrivateIpAddressCount==java.lang.Integer.MIN_VALUE) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("secondaryPrivateIpAddressCount cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSecondaryPrivateIpAddressCount));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "subnetId"));
+                                 
+                                        if (localSubnetId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSubnetId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("subnetId cannot be null!!");
+                                        }
+                                     if (localDescriptionTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "description"));
+                                 
+                                        if (localDescription != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDescription));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("description cannot be null!!");
+                                        }
+                                    } if (localPrivateIpAddressTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "privateIpAddress"));
+                                 
+                                        if (localPrivateIpAddress != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPrivateIpAddress));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("privateIpAddress cannot be null!!");
+                                        }
+                                    } if (localGroupSetTracker){
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "groupSet"));
+                            
+                            
+                                    if (localGroupSet==null){
+                                         throw new org.apache.axis2.databinding.ADBException("groupSet cannot be null!!");
+                                    }
+                                    elementList.add(localGroupSet);
+                                } if (localPrivateIpAddressesSetTracker){
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "privateIpAddressesSet"));
+                            
+                            
+                                    if (localPrivateIpAddressesSet==null){
+                                         throw new org.apache.axis2.databinding.ADBException("privateIpAddressesSet cannot be null!!");
+                                    }
+                                    elementList.add(localPrivateIpAddressesSet);
+                                } if (localSecondaryPrivateIpAddressCountTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "secondaryPrivateIpAddressCount"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSecondaryPrivateIpAddressCount));
+                            }
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateNetworkInterfaceType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateNetworkInterfaceType object =
+                new CreateNetworkInterfaceType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateNetworkInterfaceType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateNetworkInterfaceType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","subnetId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setSubnetId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","description").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setDescription(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","privateIpAddress").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setPrivateIpAddress(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","groupSet").equals(reader.getName())){
+                                
+                                                object.setGroupSet(com.amazon.ec2.SecurityGroupIdSetType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","privateIpAddressesSet").equals(reader.getName())){
+                                
+                                                object.setPrivateIpAddressesSet(com.amazon.ec2.PrivateIpAddressesSetRequestType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","secondaryPrivateIpAddressCount").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setSecondaryPrivateIpAddressCount(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToInt(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                               object.setSecondaryPrivateIpAddressCount(java.lang.Integer.MIN_VALUE);
+                                           
+                                    }
+                                  
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
index d94f990..d93500c 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreatePlacementGroup.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreatePlacementGroup",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreatePlacementGroup").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreatePlacementGroup").equals(reader.getName())){
                                 
                                                 object.setCreatePlacementGroup(com.amazon.ec2.CreatePlacementGroupType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
index 9c89cdf..d3fef91 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreatePlacementGroupResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreatePlacementGroupResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreatePlacementGroupResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreatePlacementGroupResponse").equals(reader.getName())){
                                 
                                                 object.setCreatePlacementGroupResponse(com.amazon.ec2.CreatePlacementGroupResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
index 3e47359..0c78d37 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreatePlacementGroupResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreatePlacementGroupResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreatePlacementGroupResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -238,7 +222,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -429,7 +413,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -438,7 +422,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "return"));
                                  
                                 elementList.add(
@@ -522,7 +506,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -541,7 +525,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","return").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     


[40/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
new file mode 100644
index 0000000..0301c58
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
@@ -0,0 +1,575 @@
+
+/**
+ * AssociateRouteTableType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AssociateRouteTableType bean class
+            */
+        
+        public  class AssociateRouteTableType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AssociateRouteTableType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RouteTableId
+                        */
+
+                        
+                                    protected java.lang.String localRouteTableId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRouteTableId(){
+                               return localRouteTableId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RouteTableId
+                               */
+                               public void setRouteTableId(java.lang.String param){
+                            
+                                            this.localRouteTableId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for SubnetId
+                        */
+
+                        
+                                    protected java.lang.String localSubnetId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getSubnetId(){
+                               return localSubnetId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param SubnetId
+                               */
+                               public void setSubnetId(java.lang.String param){
+                            
+                                            this.localSubnetId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AssociateRouteTableType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AssociateRouteTableType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AssociateRouteTableType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"routeTableId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"routeTableId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("routeTableId");
+                                    }
+                                
+
+                                          if (localRouteTableId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("routeTableId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRouteTableId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"subnetId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"subnetId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("subnetId");
+                                    }
+                                
+
+                                          if (localSubnetId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("subnetId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localSubnetId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "routeTableId"));
+                                 
+                                        if (localRouteTableId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRouteTableId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("routeTableId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "subnetId"));
+                                 
+                                        if (localSubnetId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSubnetId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("subnetId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AssociateRouteTableType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AssociateRouteTableType object =
+                new AssociateRouteTableType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AssociateRouteTableType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AssociateRouteTableType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","routeTableId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRouteTableId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","subnetId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setSubnetId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGateway.java b/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
new file mode 100644
index 0000000..4ae3127
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
@@ -0,0 +1,362 @@
+
+/**
+ * AttachInternetGateway.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AttachInternetGateway bean class
+            */
+        
+        public  class AttachInternetGateway
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "AttachInternetGateway",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AttachInternetGateway
+                        */
+
+                        
+                                    protected com.amazon.ec2.AttachInternetGatewayType localAttachInternetGateway ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AttachInternetGatewayType
+                           */
+                           public  com.amazon.ec2.AttachInternetGatewayType getAttachInternetGateway(){
+                               return localAttachInternetGateway;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AttachInternetGateway
+                               */
+                               public void setAttachInternetGateway(com.amazon.ec2.AttachInternetGatewayType param){
+                            
+                                            this.localAttachInternetGateway=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AttachInternetGateway.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localAttachInternetGateway==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localAttachInternetGateway.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localAttachInternetGateway.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AttachInternetGateway parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AttachInternetGateway object =
+                new AttachInternetGateway();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AttachInternetGateway").equals(reader.getName())){
+                                
+                                                object.setAttachInternetGateway(com.amazon.ec2.AttachInternetGatewayType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
new file mode 100644
index 0000000..7955e2a
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * AttachInternetGatewayResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AttachInternetGatewayResponse bean class
+            */
+        
+        public  class AttachInternetGatewayResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "AttachInternetGatewayResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for AttachInternetGatewayResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.AttachInternetGatewayResponseType localAttachInternetGatewayResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.AttachInternetGatewayResponseType
+                           */
+                           public  com.amazon.ec2.AttachInternetGatewayResponseType getAttachInternetGatewayResponse(){
+                               return localAttachInternetGatewayResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param AttachInternetGatewayResponse
+                               */
+                               public void setAttachInternetGatewayResponse(com.amazon.ec2.AttachInternetGatewayResponseType param){
+                            
+                                            this.localAttachInternetGatewayResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AttachInternetGatewayResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localAttachInternetGatewayResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localAttachInternetGatewayResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localAttachInternetGatewayResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AttachInternetGatewayResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AttachInternetGatewayResponse object =
+                new AttachInternetGatewayResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","AttachInternetGatewayResponse").equals(reader.getName())){
+                                
+                                                object.setAttachInternetGatewayResponse(com.amazon.ec2.AttachInternetGatewayResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
new file mode 100644
index 0000000..d4edca6
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * AttachInternetGatewayResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  AttachInternetGatewayResponseType bean class
+            */
+        
+        public  class AttachInternetGatewayResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = AttachInternetGatewayResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       AttachInternetGatewayResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":AttachInternetGatewayResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "AttachInternetGatewayResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static AttachInternetGatewayResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            AttachInternetGatewayResponseType object =
+                new AttachInternetGatewayResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"AttachInternetGatewayResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (AttachInternetGatewayResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[64/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java
index 7a58575..526dc44 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeRegionsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java
index 087de48..3e5d777 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeRegionsSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java
index 1a71201..e3800a6 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeRegionsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeRegionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsType.java
index 4453c02..f8dc2f8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegionsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegionsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeRegionsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java
index 0a3c25a..d808e72 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstances.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java
index 0e9b8ca..e811709 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesListingSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java
index 5ff1b0b..657afd4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesListingSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java
index cf3ab61..0f7c5b6 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesListings.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java
index f792b96..8cff345 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesListingsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java
index 20d7dc8..dc5a6c9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesListingsResponseSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java
index 1534d52..9f521e2 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesListingsResponseSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java
index f80a7c8..840be45 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesListingsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java
index fc2e36f..d63947d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesListingsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java
index 7d4d3c2..bc4268e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesOfferings.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java
index 57e6391..8b55718 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesOfferingsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java
index 01a7f61..73e79a8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesOfferingsResponseSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java
index 79e63fb..6e61571 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesOfferingsResponseSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java
index 12141c9..effd111 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesOfferingsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java
index d25acd3..443782c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesOfferingsSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java
index 7385af8..f31e8d4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesOfferingsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java
index bb97645..657fec6 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesOfferingsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java
index ac22cfc..41bac49 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java
index 0e7ca08..9e59911 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesResponseSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java
index 7911232..3c593e0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesResponseSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java
index 5ddd570..ce82313 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java
index af35ec0..5296440 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java
index 5d0cab2..c0928d2 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java
index fba8346..77dfa02 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeReservedInstancesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeRouteTables.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTables.java b/awsapi/src/com/amazon/ec2/DescribeRouteTables.java
index 8bf3f31..86e5001 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRouteTables.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRouteTables.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeRouteTables.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java
index 8f7112e..58e3732 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeRouteTablesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java
index aa1eac9..6216a55 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeRouteTablesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java b/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java
index b2636e2..691b77f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeRouteTablesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java
index 2482c42..474aa89 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSecurityGroups.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java
index d868b5f..c85a551 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSecurityGroupsIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java
index 36539f7..af8afa9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSecurityGroupsIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java
index 1a185e4..dcda26b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSecurityGroupsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java
index 4a4ea8c..8af5f8a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSecurityGroupsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java
index 23846ab..dc7b679 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSecurityGroupsSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java
index 6b13975..60846dc 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSecurityGroupsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java
index 5786996..4b29d7d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSecurityGroupsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java
index adf3fd1..f2290f9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java
index 062353c..59d6bbb 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java
index eb44681..702e457 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java
index fe554ab..e4bf059 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotAttributeResponseTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java
index 45aedba..6d41c0d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java
index a99c3f2..2c20758 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotAttributesGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshots.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshots.java b/awsapi/src/com/amazon/ec2/DescribeSnapshots.java
index fcf3c42..b7cc0f6 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshots.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshots.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshots.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java
index 63457f5..adbacf2 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsOwnerType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java
index ef37f40..8ae03b7 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsOwnersType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java
index c9347ee..35f2406 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java
index c85d4e5..d653e67 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java
index d44ad2e..d54b38d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsRestorableBySetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java
index 91fd21d..a872fea 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsRestorableByType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java
index 7c651fb..cffe422 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsSetItemResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java
index a00bf97..0ad9896 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java
index 0dac0e2..b52a1e5 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsSetResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java
index 917ca93..5cd82ba 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java
index 12a3d89..68f753b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSnapshotsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java
index 2e5a6e4..429d0dc 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotDatafeedSubscription.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java
index 9744dbd..ead43d9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotDatafeedSubscriptionResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java
index d2c6c78..9faed02 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotDatafeedSubscriptionResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java
index 2128302..a17f327 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotDatafeedSubscriptionType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java
index 04c2449..3731ca3 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotInstanceRequests.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java
index 853b340..962a2d8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotInstanceRequestsResponse.java


[21/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
new file mode 100644
index 0000000..cb3a6e5
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
@@ -0,0 +1,736 @@
+
+/**
+ * CreateReservedInstancesListingType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateReservedInstancesListingType bean class
+            */
+        
+        public  class CreateReservedInstancesListingType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateReservedInstancesListingType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for ReservedInstancesId
+                        */
+
+                        
+                                    protected java.lang.String localReservedInstancesId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getReservedInstancesId(){
+                               return localReservedInstancesId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param ReservedInstancesId
+                               */
+                               public void setReservedInstancesId(java.lang.String param){
+                            
+                                            this.localReservedInstancesId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for InstanceCount
+                        */
+
+                        
+                                    protected int localInstanceCount ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localInstanceCountTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return int
+                           */
+                           public  int getInstanceCount(){
+                               return localInstanceCount;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param InstanceCount
+                               */
+                               public void setInstanceCount(int param){
+                            
+                                       // setting primitive attribute tracker to true
+                                       
+                                               if (param==java.lang.Integer.MIN_VALUE) {
+                                           localInstanceCountTracker = false;
+                                              
+                                       } else {
+                                          localInstanceCountTracker = true;
+                                       }
+                                   
+                                            this.localInstanceCount=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for PriceSchedules
+                        */
+
+                        
+                                    protected com.amazon.ec2.PriceScheduleRequestSetType localPriceSchedules ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.PriceScheduleRequestSetType
+                           */
+                           public  com.amazon.ec2.PriceScheduleRequestSetType getPriceSchedules(){
+                               return localPriceSchedules;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param PriceSchedules
+                               */
+                               public void setPriceSchedules(com.amazon.ec2.PriceScheduleRequestSetType param){
+                            
+                                            this.localPriceSchedules=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for ClientToken
+                        */
+
+                        
+                                    protected java.lang.String localClientToken ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getClientToken(){
+                               return localClientToken;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param ClientToken
+                               */
+                               public void setClientToken(java.lang.String param){
+                            
+                                            this.localClientToken=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateReservedInstancesListingType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateReservedInstancesListingType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateReservedInstancesListingType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"reservedInstancesId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"reservedInstancesId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("reservedInstancesId");
+                                    }
+                                
+
+                                          if (localReservedInstancesId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("reservedInstancesId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localReservedInstancesId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                              if (localInstanceCountTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"instanceCount", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"instanceCount");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("instanceCount");
+                                    }
+                                
+                                               if (localInstanceCount==java.lang.Integer.MIN_VALUE) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("instanceCount cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localInstanceCount));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
+                                            if (localPriceSchedules==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("priceSchedules cannot be null!!");
+                                            }
+                                           localPriceSchedules.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","priceSchedules"),
+                                               factory,xmlWriter);
+                                        
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"clientToken", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"clientToken");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("clientToken");
+                                    }
+                                
+
+                                          if (localClientToken==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("clientToken cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localClientToken);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "reservedInstancesId"));
+                                 
+                                        if (localReservedInstancesId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localReservedInstancesId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("reservedInstancesId cannot be null!!");
+                                        }
+                                     if (localInstanceCountTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "instanceCount"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localInstanceCount));
+                            }
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "priceSchedules"));
+                            
+                            
+                                    if (localPriceSchedules==null){
+                                         throw new org.apache.axis2.databinding.ADBException("priceSchedules cannot be null!!");
+                                    }
+                                    elementList.add(localPriceSchedules);
+                                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "clientToken"));
+                                 
+                                        if (localClientToken != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localClientToken));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("clientToken cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateReservedInstancesListingType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateReservedInstancesListingType object =
+                new CreateReservedInstancesListingType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateReservedInstancesListingType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateReservedInstancesListingType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","reservedInstancesId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setReservedInstancesId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceCount").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setInstanceCount(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToInt(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                               object.setInstanceCount(java.lang.Integer.MIN_VALUE);
+                                           
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","priceSchedules").equals(reader.getName())){
+                                
+                                                object.setPriceSchedules(com.amazon.ec2.PriceScheduleRequestSetType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","clientToken").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setClientToken(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRoute.java b/awsapi/src/com/amazon/ec2/CreateRoute.java
new file mode 100644
index 0000000..ccbd08d
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateRoute.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateRoute.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateRoute bean class
+            */
+        
+        public  class CreateRoute
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateRoute",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateRoute
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateRouteType localCreateRoute ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateRouteType
+                           */
+                           public  com.amazon.ec2.CreateRouteType getCreateRoute(){
+                               return localCreateRoute;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateRoute
+                               */
+                               public void setCreateRoute(com.amazon.ec2.CreateRouteType param){
+                            
+                                            this.localCreateRoute=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateRoute.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateRoute==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateRoute.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateRoute.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateRoute parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateRoute object =
+                new CreateRoute();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateRoute").equals(reader.getName())){
+                                
+                                                object.setCreateRoute(com.amazon.ec2.CreateRouteType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteResponse.java b/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
new file mode 100644
index 0000000..4947df1
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateRouteResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateRouteResponse bean class
+            */
+        
+        public  class CreateRouteResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateRouteResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateRouteResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateRouteResponseType localCreateRouteResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateRouteResponseType
+                           */
+                           public  com.amazon.ec2.CreateRouteResponseType getCreateRouteResponse(){
+                               return localCreateRouteResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateRouteResponse
+                               */
+                               public void setCreateRouteResponse(com.amazon.ec2.CreateRouteResponseType param){
+                            
+                                            this.localCreateRouteResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateRouteResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateRouteResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateRouteResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateRouteResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateRouteResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateRouteResponse object =
+                new CreateRouteResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateRouteResponse").equals(reader.getName())){
+                                
+                                                object.setCreateRouteResponse(com.amazon.ec2.CreateRouteResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[68/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
index 92b9dac..ed83b37 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkInterfaceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
index d93500c..9dd3640 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreatePlacementGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
index d3fef91..5bdd4fb 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreatePlacementGroupResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
index 0c78d37..45676ab 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreatePlacementGroupResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
index 6357026..ed314b0 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreatePlacementGroupType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
index d512c7a..9125da3 100644
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateReservedInstancesListing.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
index edbd653..567b4c2 100644
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateReservedInstancesListingResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
index b4bdc91..091bca7 100644
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateReservedInstancesListingResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
index cb3a6e5..ca965b4 100644
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateReservedInstancesListingType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRoute.java b/awsapi/src/com/amazon/ec2/CreateRoute.java
index ccbd08d..5c79fba 100644
--- a/awsapi/src/com/amazon/ec2/CreateRoute.java
+++ b/awsapi/src/com/amazon/ec2/CreateRoute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateRoute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteResponse.java b/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
index 4947df1..be7f1b9 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateRouteResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java b/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
index 32c9b20..c940284 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateRouteResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTable.java b/awsapi/src/com/amazon/ec2/CreateRouteTable.java
index 888c248..4d92e09 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteTable.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTable.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateRouteTable.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
index b7907d8..493e4f6 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateRouteTableResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
index 33e2202..6199349 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateRouteTableResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableType.java b/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
index 6989140..7e4f2f1 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateRouteTableType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteType.java b/awsapi/src/com/amazon/ec2/CreateRouteType.java
index 616ff65..a08ce00 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteType.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateRouteType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
index 813c355..a712900 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateRouteTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
index d4606cd..a5e126d 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSecurityGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
index 474024e..5d8084d 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSecurityGroupResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
index 260da9d..d8126f6 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSecurityGroupResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
index 0483a91..b2ffc17 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSecurityGroupType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSnapshot.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshot.java b/awsapi/src/com/amazon/ec2/CreateSnapshot.java
index ab586fa..7dd7296 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshot.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshot.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSnapshot.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java b/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
index 6a79fc3..3b3312b 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSnapshotResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java b/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
index 9db0e79..74b5d83 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSnapshotResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotType.java b/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
index fe9867c..aa9601d 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSnapshotType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
index 59de481..008a264 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSpotDatafeedSubscription.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
index b3aaf7d..f13448d 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSpotDatafeedSubscriptionResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
index 26e2048..d6be2ef 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSpotDatafeedSubscriptionResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
index 01adf95..80c3c77 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSpotDatafeedSubscriptionType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSubnet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnet.java b/awsapi/src/com/amazon/ec2/CreateSubnet.java
index 065a2fb..1dbae30 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnet.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnet.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSubnet.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java b/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
index e49e304..fbedbaf 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSubnetResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java b/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
index f686dd1..88e1f30 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSubnetResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateSubnetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetType.java b/awsapi/src/com/amazon/ec2/CreateSubnetType.java
index 583f84c..09faaec 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnetType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateSubnetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateTags.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTags.java b/awsapi/src/com/amazon/ec2/CreateTags.java
index a3a00a6..d745ed2 100644
--- a/awsapi/src/com/amazon/ec2/CreateTags.java
+++ b/awsapi/src/com/amazon/ec2/CreateTags.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateTags.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTagsResponse.java b/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
index 2e95c0c..f3f318c 100644
--- a/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateTagsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java b/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
index c3e7f4c..92e9b27 100644
--- a/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateTagsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateTagsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTagsType.java b/awsapi/src/com/amazon/ec2/CreateTagsType.java
index c61c21e..4fdfa11 100644
--- a/awsapi/src/com/amazon/ec2/CreateTagsType.java
+++ b/awsapi/src/com/amazon/ec2/CreateTagsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateTagsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolume.java b/awsapi/src/com/amazon/ec2/CreateVolume.java
index fd25eec..75ff16c 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolume.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolume.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVolume.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
index a12aebd..56dd476 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVolumePermissionItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
index fac08ee..b9a0831 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVolumePermissionListType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
index 28265dc..b60cb0f 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVolumePermissionOperationType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java b/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
index b086b8c..c2736dc 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVolumeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java b/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
index b61914e..74acc88 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVolumeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeType.java b/awsapi/src/com/amazon/ec2/CreateVolumeType.java
index 0ff4422..7a0a556 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVolumeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpc.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpc.java b/awsapi/src/com/amazon/ec2/CreateVpc.java
index 0015b69..419d3a1 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpc.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpc.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpc.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpcResponse.java b/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
index d0f976f..76d7406 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpcResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
index 95bc395..1b0572e 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpcResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpcType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpcType.java b/awsapi/src/com/amazon/ec2/CreateVpcType.java
index d4f2361..7111bbe 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpcType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpcType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpcType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnection.java b/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
index 567f5d8..53e098e 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnConnection.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
index a3d099d..e350bca 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnConnectionResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
index 90f67d4..302a5f8 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnConnectionResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
index e341202..3c3facb 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnConnectionRoute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
index 381cf79..3a0b97c 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnConnectionRouteResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
index d685f73..dfdf099 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnConnectionRouteResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
index efb1e6a..c266537 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnConnectionRouteType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
index e659cab..2d0ae6e 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnConnectionType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGateway.java b/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
index fb2dca5..11f2066 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnGateway.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
index e10b761..4741c14 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnGatewayResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
index 30df2c7..75cf1cc 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnGatewayResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
index b03538b..dc16fe9 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateVpnGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
index b2de817..d33c2e7 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CustomerGatewayIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
index 9b0c23b..50a95ee 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CustomerGatewayIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java b/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
index be2efeb..236bcda 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CustomerGatewaySetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
index 30f2e4e..aafe033 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CustomerGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DeactivateLicense.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicense.java b/awsapi/src/com/amazon/ec2/DeactivateLicense.java
index 5904552..a297da0 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicense.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicense.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DeactivateLicense.java


[29/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
new file mode 100644
index 0000000..bfc2ddc
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateInstanceExportTask.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateInstanceExportTask bean class
+            */
+        
+        public  class CreateInstanceExportTask
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateInstanceExportTask",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateInstanceExportTask
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateInstanceExportTaskType localCreateInstanceExportTask ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateInstanceExportTaskType
+                           */
+                           public  com.amazon.ec2.CreateInstanceExportTaskType getCreateInstanceExportTask(){
+                               return localCreateInstanceExportTask;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateInstanceExportTask
+                               */
+                               public void setCreateInstanceExportTask(com.amazon.ec2.CreateInstanceExportTaskType param){
+                            
+                                            this.localCreateInstanceExportTask=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateInstanceExportTask.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateInstanceExportTask==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateInstanceExportTask.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateInstanceExportTask.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateInstanceExportTask parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateInstanceExportTask object =
+                new CreateInstanceExportTask();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateInstanceExportTask").equals(reader.getName())){
+                                
+                                                object.setCreateInstanceExportTask(com.amazon.ec2.CreateInstanceExportTaskType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
new file mode 100644
index 0000000..d64646d
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateInstanceExportTaskResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateInstanceExportTaskResponse bean class
+            */
+        
+        public  class CreateInstanceExportTaskResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateInstanceExportTaskResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateInstanceExportTaskResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateInstanceExportTaskResponseType localCreateInstanceExportTaskResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateInstanceExportTaskResponseType
+                           */
+                           public  com.amazon.ec2.CreateInstanceExportTaskResponseType getCreateInstanceExportTaskResponse(){
+                               return localCreateInstanceExportTaskResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateInstanceExportTaskResponse
+                               */
+                               public void setCreateInstanceExportTaskResponse(com.amazon.ec2.CreateInstanceExportTaskResponseType param){
+                            
+                                            this.localCreateInstanceExportTaskResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateInstanceExportTaskResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateInstanceExportTaskResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateInstanceExportTaskResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateInstanceExportTaskResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateInstanceExportTaskResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateInstanceExportTaskResponse object =
+                new CreateInstanceExportTaskResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateInstanceExportTaskResponse").equals(reader.getName())){
+                                
+                                                object.setCreateInstanceExportTaskResponse(com.amazon.ec2.CreateInstanceExportTaskResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
new file mode 100644
index 0000000..7cf9412
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
@@ -0,0 +1,544 @@
+
+/**
+ * CreateInstanceExportTaskResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateInstanceExportTaskResponseType bean class
+            */
+        
+        public  class CreateInstanceExportTaskResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateInstanceExportTaskResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for ExportTask
+                        */
+
+                        
+                                    protected com.amazon.ec2.ExportTaskResponseType localExportTask ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.ExportTaskResponseType
+                           */
+                           public  com.amazon.ec2.ExportTaskResponseType getExportTask(){
+                               return localExportTask;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param ExportTask
+                               */
+                               public void setExportTask(com.amazon.ec2.ExportTaskResponseType param){
+                            
+                                            this.localExportTask=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateInstanceExportTaskResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateInstanceExportTaskResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateInstanceExportTaskResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                            if (localExportTask==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("exportTask cannot be null!!");
+                                            }
+                                           localExportTask.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","exportTask"),
+                                               factory,xmlWriter);
+                                        
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "exportTask"));
+                            
+                            
+                                    if (localExportTask==null){
+                                         throw new org.apache.axis2.databinding.ADBException("exportTask cannot be null!!");
+                                    }
+                                    elementList.add(localExportTask);
+                                
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateInstanceExportTaskResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateInstanceExportTaskResponseType object =
+                new CreateInstanceExportTaskResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateInstanceExportTaskResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateInstanceExportTaskResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","exportTask").equals(reader.getName())){
+                                
+                                                object.setExportTask(com.amazon.ec2.ExportTaskResponseType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[63/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java
index fbe3e48..63864f5 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotInstanceRequestsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java
index 4ed6927..5cc5928 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotInstanceRequestsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java
index 9f5611c..31c2d09 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotPriceHistory.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java
index 2682811..b661a9c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotPriceHistoryResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java
index bc70232..e9ceefd 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotPriceHistoryResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java
index 649bb66..1ca08cc 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSpotPriceHistoryType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSubnets.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnets.java b/awsapi/src/com/amazon/ec2/DescribeSubnets.java
index 94c99c9..c959f84 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSubnets.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSubnets.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSubnets.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java
index 5c291e5..f19f3cf 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSubnetsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java
index 2d366d1..36c2ecb 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSubnetsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java b/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java
index 642fdb3..eec4435 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeSubnetsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeTags.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeTags.java b/awsapi/src/com/amazon/ec2/DescribeTags.java
index 6fd2826..3f7fd84 100644
--- a/awsapi/src/com/amazon/ec2/DescribeTags.java
+++ b/awsapi/src/com/amazon/ec2/DescribeTags.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeTags.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java b/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java
index 34f2308..f4fe8aa 100644
--- a/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeTagsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java
index 94de049..b26083d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeTagsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeTagsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeTagsType.java b/awsapi/src/com/amazon/ec2/DescribeTagsType.java
index 56eaa36..98af19d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeTagsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeTagsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeTagsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java
index e413af6..53842be 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumeAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java
index 76af12f..ddf9239 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumeAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java
index f834a88..826a620 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumeAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java
index 0765133..5320255 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumeAttributeResponseTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java
index 30f1c62..614625a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumeAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java
index 534abf8..371d486 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumeAttributesGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java
index da4b4c0..a5de780 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumeStatus.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java
index c6f3844..8774937 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumeStatusResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java
index d856bce..86b4a82 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumeStatusResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java
index 71e5f1e..1591a72 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumeStatusType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumes.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumes.java b/awsapi/src/com/amazon/ec2/DescribeVolumes.java
index 108851c..a5e6945 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumes.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumes.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumes.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java b/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java
index 1852939..6b0db3e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java
index ffb6da9..06936f7 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java
index f41b714..c1e70a4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumesSetItemResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java
index 527b21f..b79be28 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumesSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java
index 58040e5..2175975 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumesSetResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java
index b6b778f..4b0f927 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVolumesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesType.java
index 8996fa3..5df6d86 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVolumesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpcs.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcs.java b/awsapi/src/com/amazon/ec2/DescribeVpcs.java
index 087fd36..7e1b34d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpcs.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpcs.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpcs.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java b/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java
index 7514424..8b4e789 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpcsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java
index 165741e..b6baa88 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpcsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpcsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcsType.java b/awsapi/src/com/amazon/ec2/DescribeVpcsType.java
index 6be275a..76c948a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpcsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpcsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpcsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java
index 93c8aa7..962cf24 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpnConnections.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java
index 2999d39..789ccd1 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpnConnectionsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java
index 4a7ae5d..c308d6a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpnConnectionsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java
index 626b2d0..5aeaa03 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpnConnectionsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java b/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java
index 22c1ce8..8c06d98 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpnGateways.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java
index 3b732f0..42505e6 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpnGatewaysResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java
index 974c347..eb93795 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpnGatewaysResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java
index af6571c..0e5f815 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DescribeVpnGatewaysType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGateway.java b/awsapi/src/com/amazon/ec2/DetachInternetGateway.java
index 786dbee..37dcf34 100644
--- a/awsapi/src/com/amazon/ec2/DetachInternetGateway.java
+++ b/awsapi/src/com/amazon/ec2/DetachInternetGateway.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachInternetGateway.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java
index 8fb13c8..12f60cb 100644
--- a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachInternetGatewayResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java
index 68e7695..c101733 100644
--- a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachInternetGatewayResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java b/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java
index c5eac30..53189a3 100644
--- a/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachInternetGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java
index 3780a8a..537eeb3 100644
--- a/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java
+++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachNetworkInterface.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java
index 54fd1fa..f1a064d 100644
--- a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java
+++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachNetworkInterfaceResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java
index d1248a1..3cc7224 100644
--- a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachNetworkInterfaceResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java
index a1ac99f..0ad1237 100644
--- a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java
+++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachNetworkInterfaceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVolume.java b/awsapi/src/com/amazon/ec2/DetachVolume.java
index afa3593..38722f0 100644
--- a/awsapi/src/com/amazon/ec2/DetachVolume.java
+++ b/awsapi/src/com/amazon/ec2/DetachVolume.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachVolume.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java b/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java
index 4c9799b..d6796dd 100644
--- a/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachVolumeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java b/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java
index 0be3d04..a3ad7dc 100644
--- a/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachVolumeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVolumeType.java b/awsapi/src/com/amazon/ec2/DetachVolumeType.java
index ada993b..0b29bac 100644
--- a/awsapi/src/com/amazon/ec2/DetachVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/DetachVolumeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachVolumeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGateway.java b/awsapi/src/com/amazon/ec2/DetachVpnGateway.java
index a588e5e..37b483c 100644
--- a/awsapi/src/com/amazon/ec2/DetachVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/DetachVpnGateway.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachVpnGateway.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java
index 684c7fd..66cc22a 100644
--- a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachVpnGatewayResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java
index 1ef4109..5e1e27e 100644
--- a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachVpnGatewayResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java b/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java
index 5f889ec..82a24a3 100644
--- a/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DetachVpnGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java
index 314e10f..29c1a8f 100644
--- a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DhcpConfigurationItemSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java
index 5761c80..0f6e471 100644
--- a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DhcpConfigurationItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java
index 69e3659..5a99284 100644
--- a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DhcpOptionsIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java
index fd53c85..20928e5 100644
--- a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DhcpOptionsIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java
index 5c6a4ce..d3adbff 100644
--- a/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DhcpOptionsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/DhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsType.java
index 6cd7146..7502649 100644
--- a/awsapi/src/com/amazon/ec2/DhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpOptionsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * DhcpOptionsType.java


[69/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
index 64c0ab0..c8d6db7 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelBundleTaskResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
index 12352c7..909fdaa 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelBundleTaskResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
index 9f46a6e..72f6fda 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelBundleTaskType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelConversionTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTask.java b/awsapi/src/com/amazon/ec2/CancelConversionTask.java
index 70b0e6c..274c6b6 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTask.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTask.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelConversionTask.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
index bc091c7..15d3881 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelConversionTaskResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
index f42e914..e96ed4c 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelConversionTaskResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
index e611738..d24006d 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelConversionTaskType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelExportTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTask.java b/awsapi/src/com/amazon/ec2/CancelExportTask.java
index ef47f31..23109c6 100644
--- a/awsapi/src/com/amazon/ec2/CancelExportTask.java
+++ b/awsapi/src/com/amazon/ec2/CancelExportTask.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelExportTask.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
index cbd4e67..f3651c3 100644
--- a/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelExportTaskResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
index 8283680..1c527aa 100644
--- a/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelExportTaskResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskType.java b/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
index c077225..b1eedf5 100644
--- a/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
+++ b/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelExportTaskType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
index 9ad2ac1..202f424 100644
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelReservedInstancesListing.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
index 2d53d02..b6a1f1a 100644
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelReservedInstancesListingResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
index 05d8011..b1affd9 100644
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelReservedInstancesListingResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
index a6e6674..abebf94 100644
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelReservedInstancesListingType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
index da1c3a2..20d9342 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelSpotInstanceRequests.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
index 7a1ea23..f3febb4 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelSpotInstanceRequestsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
index a99518e..77f8a77 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelSpotInstanceRequestsResponseSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
index 8cf225c..1c57061 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelSpotInstanceRequestsResponseSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
index 3da3703..31ec771 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelSpotInstanceRequestsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
index 2b810b5..5cac151 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CancelSpotInstanceRequestsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
index 64db4bc..4442343 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ConfirmProductInstance.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
index b5541b6..99ca499 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ConfirmProductInstanceResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
index 14cf24f..22aa47a 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ConfirmProductInstanceResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
index 3d39a57..81c348c 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ConfirmProductInstanceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java b/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
index 198b837..2317754 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ConversionTaskIdItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java b/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
index 582bcf9..5d04a4e 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ConversionTaskIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java b/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
index b2cb323..0963cd6 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ConversionTaskSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ConversionTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskType.java b/awsapi/src/com/amazon/ec2/ConversionTaskType.java
index a7916d1..d1c6927 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ConversionTaskType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
index d0676bc..6fbad79 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ConversionTaskTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
index c426e35..f4dfb3b 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateCustomerGateway.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
index 69e485a..ff05377 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateCustomerGatewayResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
index 4ad9835..87f28c3 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateCustomerGatewayResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
index 086ccbf..4ff51f3 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateCustomerGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
index f98ca97..f4d9486 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateDhcpOptions.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
index c15a47e..c9c927a 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateDhcpOptionsResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
index 282d7d8..8f2d0d9 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateDhcpOptionsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
index ad5b13d..d595df9 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateDhcpOptionsType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateImage.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImage.java b/awsapi/src/com/amazon/ec2/CreateImage.java
index 0c089dd..17cab01 100644
--- a/awsapi/src/com/amazon/ec2/CreateImage.java
+++ b/awsapi/src/com/amazon/ec2/CreateImage.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateImage.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateImageResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImageResponse.java b/awsapi/src/com/amazon/ec2/CreateImageResponse.java
index 19e7a34..616ed47 100644
--- a/awsapi/src/com/amazon/ec2/CreateImageResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateImageResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateImageResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
index 4a816b1..040e888 100644
--- a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateImageResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateImageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImageType.java b/awsapi/src/com/amazon/ec2/CreateImageType.java
index 9dc92c5..68928cb 100644
--- a/awsapi/src/com/amazon/ec2/CreateImageType.java
+++ b/awsapi/src/com/amazon/ec2/CreateImageType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateImageType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
index bfc2ddc..59d4494 100644
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateInstanceExportTask.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
index d64646d..14fc7c5 100644
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateInstanceExportTaskResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
index 7cf9412..9ad0c15 100644
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateInstanceExportTaskResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
index 8fc718b..2370e5c 100644
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateInstanceExportTaskType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
index 921ddff..f88100f 100644
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateInstanceExportTaskTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGateway.java b/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
index 73d1f17..943d75d 100644
--- a/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateInternetGateway.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
index 3998fd8..0fd1b46 100644
--- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateInternetGatewayResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
index cf8730d..2a0d1c5 100644
--- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateInternetGatewayResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
index e6b401f..2480a42 100644
--- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateInternetGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateKeyPair.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPair.java b/awsapi/src/com/amazon/ec2/CreateKeyPair.java
index c640861..4ee4d26 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPair.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPair.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateKeyPair.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java b/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
index 149a714..cd2c700 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateKeyPairResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
index 4df22de..c81364e 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateKeyPairResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairType.java b/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
index 279c8c9..7db26ec 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateKeyPairType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java b/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
index 95afd51..b729948 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkAcl.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
index 3f01819..dbb60e3 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkAclEntry.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
index d852b03..61a2dc0 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkAclEntryResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
index 954a8d9..c859005 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkAclEntryResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
index 25f9929..45dc0b5 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkAclEntryType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
index 7e861d2..0c338eb 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkAclResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
index 1ea12e2..9a2b764 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkAclResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
index f414102..4e6f366 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkAclType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
index b41e2fc..02aab3a 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkInterface.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
index ff5f649..ffd6a78 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkInterfaceResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
index 52b2e62..1afc98b 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * CreateNetworkInterfaceResponseType.java


[15/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
new file mode 100644
index 0000000..381cf79
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateVpnConnectionRouteResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateVpnConnectionRouteResponse bean class
+            */
+        
+        public  class CreateVpnConnectionRouteResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateVpnConnectionRouteResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateVpnConnectionRouteResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateVpnConnectionRouteResponseType localCreateVpnConnectionRouteResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateVpnConnectionRouteResponseType
+                           */
+                           public  com.amazon.ec2.CreateVpnConnectionRouteResponseType getCreateVpnConnectionRouteResponse(){
+                               return localCreateVpnConnectionRouteResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateVpnConnectionRouteResponse
+                               */
+                               public void setCreateVpnConnectionRouteResponse(com.amazon.ec2.CreateVpnConnectionRouteResponseType param){
+                            
+                                            this.localCreateVpnConnectionRouteResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateVpnConnectionRouteResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateVpnConnectionRouteResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateVpnConnectionRouteResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateVpnConnectionRouteResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateVpnConnectionRouteResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateVpnConnectionRouteResponse object =
+                new CreateVpnConnectionRouteResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateVpnConnectionRouteResponse").equals(reader.getName())){
+                                
+                                                object.setCreateVpnConnectionRouteResponse(com.amazon.ec2.CreateVpnConnectionRouteResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
new file mode 100644
index 0000000..d685f73
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * CreateVpnConnectionRouteResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateVpnConnectionRouteResponseType bean class
+            */
+        
+        public  class CreateVpnConnectionRouteResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateVpnConnectionRouteResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateVpnConnectionRouteResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateVpnConnectionRouteResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateVpnConnectionRouteResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateVpnConnectionRouteResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateVpnConnectionRouteResponseType object =
+                new CreateVpnConnectionRouteResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateVpnConnectionRouteResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateVpnConnectionRouteResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
new file mode 100644
index 0000000..efb1e6a
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
@@ -0,0 +1,575 @@
+
+/**
+ * CreateVpnConnectionRouteType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateVpnConnectionRouteType bean class
+            */
+        
+        public  class CreateVpnConnectionRouteType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CreateVpnConnectionRouteType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for VpnConnectionId
+                        */
+
+                        
+                                    protected java.lang.String localVpnConnectionId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getVpnConnectionId(){
+                               return localVpnConnectionId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param VpnConnectionId
+                               */
+                               public void setVpnConnectionId(java.lang.String param){
+                            
+                                            this.localVpnConnectionId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for DestinationCidrBlock
+                        */
+
+                        
+                                    protected java.lang.String localDestinationCidrBlock ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getDestinationCidrBlock(){
+                               return localDestinationCidrBlock;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DestinationCidrBlock
+                               */
+                               public void setDestinationCidrBlock(java.lang.String param){
+                            
+                                            this.localDestinationCidrBlock=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateVpnConnectionRouteType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CreateVpnConnectionRouteType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CreateVpnConnectionRouteType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"vpnConnectionId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"vpnConnectionId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("vpnConnectionId");
+                                    }
+                                
+
+                                          if (localVpnConnectionId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("vpnConnectionId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localVpnConnectionId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"destinationCidrBlock", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"destinationCidrBlock");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("destinationCidrBlock");
+                                    }
+                                
+
+                                          if (localDestinationCidrBlock==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("destinationCidrBlock cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localDestinationCidrBlock);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "vpnConnectionId"));
+                                 
+                                        if (localVpnConnectionId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVpnConnectionId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("vpnConnectionId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "destinationCidrBlock"));
+                                 
+                                        if (localDestinationCidrBlock != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDestinationCidrBlock));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("destinationCidrBlock cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateVpnConnectionRouteType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateVpnConnectionRouteType object =
+                new CreateVpnConnectionRouteType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CreateVpnConnectionRouteType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CreateVpnConnectionRouteType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpnConnectionId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setVpnConnectionId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","destinationCidrBlock").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setDestinationCidrBlock(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
index 53e9fb9..e659cab 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpnConnectionType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVpnConnectionType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -137,6 +121,50 @@
                                }
                             
 
+                        /**
+                        * field for Options
+                        */
+
+                        
+                                    protected com.amazon.ec2.VpnConnectionOptionsRequestType localOptions ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localOptionsTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.VpnConnectionOptionsRequestType
+                           */
+                           public  com.amazon.ec2.VpnConnectionOptionsRequestType getOptions(){
+                               return localOptions;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Options
+                               */
+                               public void setOptions(com.amazon.ec2.VpnConnectionOptionsRequestType param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localOptionsTracker = true;
+                                       } else {
+                                          localOptionsTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localOptions=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -220,7 +248,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVpnConnectionType",
@@ -234,7 +262,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -268,7 +296,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -302,7 +330,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -335,7 +363,13 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             
+                              if (localOptionsTracker){
+                                            if (localOptions==null){
+                                                 throw new org.apache.axis2.databinding.ADBException("options cannot be null!!");
+                                            }
+                                           localOptions.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","options"),
+                                               factory,xmlWriter);
+                                        }
                     xmlWriter.writeEndElement();
                
 
@@ -498,7 +532,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "type"));
                                  
                                         if (localType != null){
@@ -507,7 +541,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("type cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "customerGatewayId"));
                                  
                                         if (localCustomerGatewayId != null){
@@ -516,7 +550,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("customerGatewayId cannot be null!!");
                                         }
                                     
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpnGatewayId"));
                                  
                                         if (localVpnGatewayId != null){
@@ -524,7 +558,16 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("vpnGatewayId cannot be null!!");
                                         }
-                                    
+                                     if (localOptionsTracker){
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "options"));
+                            
+                            
+                                    if (localOptions==null){
+                                         throw new org.apache.axis2.databinding.ADBException("options cannot be null!!");
+                                    }
+                                    elementList.add(localOptions);
+                                }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -603,7 +646,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","type").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","type").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -622,7 +665,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","customerGatewayId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","customerGatewayId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -641,7 +684,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpnGatewayId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpnGatewayId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -656,7 +699,22 @@
                                     // A start element we are not expecting indicates an invalid parameter was passed
                                     throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
                                 }
-                              
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","options").equals(reader.getName())){
+                                
+                                                object.setOptions(com.amazon.ec2.VpnConnectionOptionsRequestType.Factory.parse(reader));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                  
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();
                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGateway.java b/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
index 5e59c29..fb2dca5 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpnGateway.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateVpnGateway",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateVpnGateway").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateVpnGateway").equals(reader.getName())){
                                 
                                                 object.setCreateVpnGateway(com.amazon.ec2.CreateVpnGatewayType.Factory.parse(reader));
                                             


[56/71] [abbrv] git commit: updated refs/heads/master to 26af71b

Posted by li...@apache.org.
CLOUDSTACK-1444. Fix EC2 Query API to support latest ec2 api version 2012-08-15 [Support for EC2 API version 2012-08-15]

Signed-off-by: Likitha Shetty <li...@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d908f857
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d908f857
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d908f857

Branch: refs/heads/master
Commit: d908f857496b1c3e1213eb07260adb20de61e2c1
Parents: 7a80031
Author: Likitha Shetty <li...@citrix.com>
Authored: Fri Jun 28 09:46:23 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Jul 4 10:09:00 2013 +0530

----------------------------------------------------------------------
 awsapi/conf/ec2-service.properties.in                   | 2 +-
 awsapi/src/com/cloud/bridge/service/EC2RestServlet.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d908f857/awsapi/conf/ec2-service.properties.in
----------------------------------------------------------------------
diff --git a/awsapi/conf/ec2-service.properties.in b/awsapi/conf/ec2-service.properties.in
index 6af0f63..82f5ad8 100644
--- a/awsapi/conf/ec2-service.properties.in
+++ b/awsapi/conf/ec2-service.properties.in
@@ -18,7 +18,7 @@
 managementServer=127.0.0.1
 cloudAPIPort=8080
 cloudstackVersion=2.2.0
-WSDLVersion=2010-11-15
+WSDLVersion=2012-08-15
 keystore=xes.keystore
 keystorePass=apache
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d908f857/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 e75713f..50ac26f 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
@@ -208,7 +208,7 @@ public class EC2RestServlet extends HttpServlet {
             }
             String keystore  = EC2Prop.getProperty( "keystore" );
             keystorePassword = EC2Prop.getProperty( "keystorePass" );
-            wsdlVersion      = EC2Prop.getProperty( "WSDLVersion", "2010-11-15" );
+            wsdlVersion      = EC2Prop.getProperty( "WSDLVersion", "2012-08-15" );
             version = EC2Prop.getProperty( "cloudbridgeVersion", "UNKNOWN VERSION" );
 
             String installedPath = System.getenv("CATALINA_HOME");


[16/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeType.java b/awsapi/src/com/amazon/ec2/CreateVolumeType.java
index ddae53d..0ff4422 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumeType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVolumeType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVolumeType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -165,6 +149,95 @@
                                }
                             
 
+                        /**
+                        * field for VolumeType
+                        */
+
+                        
+                                    protected java.lang.String localVolumeType ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localVolumeTypeTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getVolumeType(){
+                               return localVolumeType;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param VolumeType
+                               */
+                               public void setVolumeType(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localVolumeTypeTracker = true;
+                                       } else {
+                                          localVolumeTypeTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localVolumeType=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for Iops
+                        */
+
+                        
+                                    protected int localIops ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localIopsTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return int
+                           */
+                           public  int getIops(){
+                               return localIops;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Iops
+                               */
+                               public void setIops(int param){
+                            
+                                       // setting primitive attribute tracker to true
+                                       
+                                               if (param==java.lang.Integer.MIN_VALUE) {
+                                           localIopsTracker = false;
+                                              
+                                       } else {
+                                          localIopsTracker = true;
+                                       }
+                                   
+                                            this.localIops=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -248,7 +321,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVolumeType",
@@ -262,7 +335,7 @@
                
                    }
                 if (localSizeTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -296,7 +369,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              } if (localSnapshotIdTracker){
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -330,7 +403,7 @@
                                     
                                    xmlWriter.writeEndElement();
                              }
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -363,7 +436,70 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             
+                              if (localVolumeTypeTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"volumeType", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"volumeType");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("volumeType");
+                                    }
+                                
+
+                                          if (localVolumeType==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("volumeType cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localVolumeType);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             } if (localIopsTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"iops", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"iops");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("iops");
+                                    }
+                                
+                                               if (localIops==java.lang.Integer.MIN_VALUE) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("iops cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localIops));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
                     xmlWriter.writeEndElement();
                
 
@@ -526,7 +662,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                  if (localSizeTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "size"));
                                  
                                         if (localSize != null){
@@ -535,7 +671,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("size cannot be null!!");
                                         }
                                     } if (localSnapshotIdTracker){
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "snapshotId"));
                                  
                                         if (localSnapshotId != null){
@@ -544,7 +680,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("snapshotId cannot be null!!");
                                         }
                                     }
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "availabilityZone"));
                                  
                                         if (localAvailabilityZone != null){
@@ -552,7 +688,22 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("availabilityZone cannot be null!!");
                                         }
-                                    
+                                     if (localVolumeTypeTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "volumeType"));
+                                 
+                                        if (localVolumeType != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVolumeType));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("volumeType cannot be null!!");
+                                        }
+                                    } if (localIopsTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "iops"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localIops));
+                            }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -631,7 +782,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","size").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","size").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -649,7 +800,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","snapshotId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","snapshotId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -667,7 +818,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","availabilityZone").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","availabilityZone").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -682,7 +833,45 @@
                                     // A start element we are not expecting indicates an invalid parameter was passed
                                     throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
                                 }
-                              
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","volumeType").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setVolumeType(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","iops").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setIops(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToInt(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                               object.setIops(java.lang.Integer.MIN_VALUE);
+                                           
+                                    }
+                                  
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();
                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpc.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpc.java b/awsapi/src/com/amazon/ec2/CreateVpc.java
index d1d6975..0015b69 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpc.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpc.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpc.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateVpc",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateVpc").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateVpc").equals(reader.getName())){
                                 
                                                 object.setCreateVpc(com.amazon.ec2.CreateVpcType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpcResponse.java b/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
index 55bee1d..d0f976f 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpcResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateVpcResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateVpcResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateVpcResponse").equals(reader.getName())){
                                 
                                                 object.setCreateVpcResponse(com.amazon.ec2.CreateVpcResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
index d6d0b19..95bc395 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpcResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVpcResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVpcResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localVpc==null){
                                                  throw new org.apache.axis2.databinding.ADBException("vpc cannot be null!!");
                                             }
-                                           localVpc.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpc"),
+                                           localVpc.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpc"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpc"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpc").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpc").equals(reader.getName())){
                                 
                                                 object.setVpc(com.amazon.ec2.VpcType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpcType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpcType.java b/awsapi/src/com/amazon/ec2/CreateVpcType.java
index 7677508..d4f2361 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpcType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpcType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpcType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVpcType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -77,6 +61,50 @@
                                }
                             
 
+                        /**
+                        * field for InstanceTenancy
+                        */
+
+                        
+                                    protected java.lang.String localInstanceTenancy ;
+                                
+                           /*  This tracker boolean wil be used to detect whether the user called the set method
+                          *   for this attribute. It will be used to determine whether to include this field
+                           *   in the serialized XML
+                           */
+                           protected boolean localInstanceTenancyTracker = false ;
+                           
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getInstanceTenancy(){
+                               return localInstanceTenancy;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param InstanceTenancy
+                               */
+                               public void setInstanceTenancy(java.lang.String param){
+                            
+                                       if (param != null){
+                                          //update the setting tracker
+                                          localInstanceTenancyTracker = true;
+                                       } else {
+                                          localInstanceTenancyTracker = false;
+                                              
+                                       }
+                                   
+                                            this.localInstanceTenancy=param;
+                                    
+
+                               }
+                            
+
      /**
      * isReaderMTOMAware
      * @return true if the reader supports MTOM
@@ -160,7 +188,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVpcType",
@@ -174,7 +202,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -207,7 +235,41 @@
                                           }
                                     
                                    xmlWriter.writeEndElement();
-                             
+                              if (localInstanceTenancyTracker){
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"instanceTenancy", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"instanceTenancy");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("instanceTenancy");
+                                    }
+                                
+
+                                          if (localInstanceTenancy==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("instanceTenancy cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localInstanceTenancy);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             }
                     xmlWriter.writeEndElement();
                
 
@@ -370,7 +432,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "cidrBlock"));
                                  
                                         if (localCidrBlock != null){
@@ -378,7 +440,16 @@
                                         } else {
                                            throw new org.apache.axis2.databinding.ADBException("cidrBlock cannot be null!!");
                                         }
-                                    
+                                     if (localInstanceTenancyTracker){
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "instanceTenancy"));
+                                 
+                                        if (localInstanceTenancy != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localInstanceTenancy));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("instanceTenancy cannot be null!!");
+                                        }
+                                    }
 
                 return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
             
@@ -457,7 +528,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","cidrBlock").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","cidrBlock").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -472,7 +543,25 @@
                                     // A start element we are not expecting indicates an invalid parameter was passed
                                     throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
                                 }
-                              
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceTenancy").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setInstanceTenancy(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                    else {
+                                        
+                                    }
+                                  
                             while (!reader.isStartElement() && !reader.isEndElement())
                                 reader.next();
                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnection.java b/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
index ef0919c..567f5d8 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpnConnection.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateVpnConnection",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateVpnConnection").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateVpnConnection").equals(reader.getName())){
                                 
                                                 object.setCreateVpnConnection(com.amazon.ec2.CreateVpnConnectionType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
index caef804..a3d099d 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpnConnectionResponse.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "CreateVpnConnectionResponse",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateVpnConnectionResponse").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateVpnConnectionResponse").equals(reader.getName())){
                                 
                                                 object.setCreateVpnConnectionResponse(com.amazon.ec2.CreateVpnConnectionResponseType.Factory.parse(reader));
                                             

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
index 54157e3..90f67d4 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CreateVpnConnectionResponseType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CreateVpnConnectionResponseType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -190,7 +174,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CreateVpnConnectionResponseType",
@@ -204,7 +188,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -241,7 +225,7 @@
                                             if (localVpnConnection==null){
                                                  throw new org.apache.axis2.databinding.ADBException("vpnConnection cannot be null!!");
                                             }
-                                           localVpnConnection.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpnConnection"),
+                                           localVpnConnection.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpnConnection"),
                                                factory,xmlWriter);
                                         
                     xmlWriter.writeEndElement();
@@ -406,7 +390,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "requestId"));
                                  
                                         if (localRequestId != null){
@@ -415,7 +399,7 @@
                                            throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
                                         }
                                     
-                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "vpnConnection"));
                             
                             
@@ -502,7 +486,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     
@@ -521,7 +505,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","vpnConnection").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","vpnConnection").equals(reader.getName())){
                                 
                                                 object.setVpnConnection(com.amazon.ec2.VpnConnectionType.Factory.parse(reader));
                                               

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
new file mode 100644
index 0000000..e341202
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
@@ -0,0 +1,362 @@
+
+/**
+ * CreateVpnConnectionRoute.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CreateVpnConnectionRoute bean class
+            */
+        
+        public  class CreateVpnConnectionRoute
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CreateVpnConnectionRoute",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CreateVpnConnectionRoute
+                        */
+
+                        
+                                    protected com.amazon.ec2.CreateVpnConnectionRouteType localCreateVpnConnectionRoute ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CreateVpnConnectionRouteType
+                           */
+                           public  com.amazon.ec2.CreateVpnConnectionRouteType getCreateVpnConnectionRoute(){
+                               return localCreateVpnConnectionRoute;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CreateVpnConnectionRoute
+                               */
+                               public void setCreateVpnConnectionRoute(com.amazon.ec2.CreateVpnConnectionRouteType param){
+                            
+                                            this.localCreateVpnConnectionRoute=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CreateVpnConnectionRoute.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCreateVpnConnectionRoute==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCreateVpnConnectionRoute.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCreateVpnConnectionRoute.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CreateVpnConnectionRoute parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CreateVpnConnectionRoute object =
+                new CreateVpnConnectionRoute();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateVpnConnectionRoute").equals(reader.getName())){
+                                
+                                                object.setCreateVpnConnectionRoute(com.amazon.ec2.CreateVpnConnectionRouteType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[50/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/resource/AmazonEC2/services.xml
----------------------------------------------------------------------
diff --git a/awsapi/resource/AmazonEC2/services.xml b/awsapi/resource/AmazonEC2/services.xml
index 31dc363..45f8cad 100644
--- a/awsapi/resource/AmazonEC2/services.xml
+++ b/awsapi/resource/AmazonEC2/services.xml
@@ -1,393 +1,589 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
 <!-- This file was auto-generated from WSDL -->
-<!-- by the Apache Axis2 version: 1.5  Built on : Apr 30, 2009 (06:07:24 EDT) -->
+<!-- by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:00:16 CEST) -->
 <serviceGroup>
-    <service name="AmazonEC2"  class="com.cloud.bridge.lifecycle.ServiceEngineLifecycle">
+    <service name="AmazonEC2">
         <messageReceivers>
             <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out" class="com.amazon.ec2.AmazonEC2MessageReceiverInOut"/>
         </messageReceivers>
-        <parameter name="ServiceClass">com.cloud.bridge.service.EC2SoapService</parameter>
+        <parameter name="ServiceClass">com.amazon.ec2.AmazonEC2Skeleton</parameter>
         <parameter name="useOriginalwsdl">true</parameter>
         <parameter name="modifyUserWSDLPortAddress">true</parameter>
-        <operation name="ModifyInstanceAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>ModifyInstanceAttribute</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/ModifyInstanceAttributeResponse</outputActionMapping>
+        <operation name="DescribePlacementGroups" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribePlacementGroups</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribePlacementGroupsResponse</outputActionMapping>
         </operation>
-        <operation name="CreateVolume" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateVolume</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateVolumeResponse</outputActionMapping>
+        <operation name="CreateSecurityGroup" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateSecurityGroup</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateSecurityGroupResponse</outputActionMapping>
         </operation>
-        <operation name="StopInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>StopInstances</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/StopInstancesResponse</outputActionMapping>
+        <operation name="ResetNetworkInterfaceAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ResetNetworkInterfaceAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ResetNetworkInterfaceAttributeResponse</outputActionMapping>
         </operation>
-        <operation name="ConfirmProductInstance" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>ConfirmProductInstance</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/ConfirmProductInstanceResponse</outputActionMapping>
+        <operation name="CreateDhcpOptions" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateDhcpOptions</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateDhcpOptionsResponse</outputActionMapping>
+        </operation>
+        <operation name="CreateRouteTable" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateRouteTable</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateRouteTableResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeSubnets" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeSubnets</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeSubnetsResponse</outputActionMapping>
+        </operation>
+        <operation name="DeactivateLicense" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeactivateLicense</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeactivateLicenseResponse</outputActionMapping>
+        </operation>
+        <operation name="DeleteVpc" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteVpc</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteVpcResponse</outputActionMapping>
         </operation>
-        <operation name="RequestSpotInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
+        <operation name="CancelSpotInstanceRequests" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CancelSpotInstanceRequests</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CancelSpotInstanceRequestsResponse</outputActionMapping>
+        </operation>
+        <operation name="CreateSubnet" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateSubnet</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateSubnetResponse</outputActionMapping>
+        </operation>
+        <operation name="DeleteVpnGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteVpnGateway</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteVpnGatewayResponse</outputActionMapping>
+        </operation>
+        <operation name="CreateNetworkAclEntry" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateNetworkAclEntry</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateNetworkAclEntryResponse</outputActionMapping>
+        </operation>
+        <operation name="RequestSpotInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
             <actionMapping>RequestSpotInstances</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/RequestSpotInstancesResponse</outputActionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/RequestSpotInstancesResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteSecurityGroup" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteSecurityGroup</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteSecurityGroupResponse</outputActionMapping>
+        <operation name="DescribeVolumeAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeVolumeAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeVolumeAttributeResponse</outputActionMapping>
         </operation>
-        <operation name="CreateSpotDatafeedSubscription" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateSpotDatafeedSubscription</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateSpotDatafeedSubscriptionResponse</outputActionMapping>
+        <operation name="AssociateDhcpOptions" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>AssociateDhcpOptions</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AssociateDhcpOptionsResponse</outputActionMapping>
         </operation>
-        <operation name="RegisterImage" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>RegisterImage</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/RegisterImageResponse</outputActionMapping>
+        <operation name="DescribeTags" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeTags</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeTagsResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteKeyPair" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteKeyPair</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteKeyPairResponse</outputActionMapping>
+        <operation name="ImportKeyPair" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ImportKeyPair</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ImportKeyPairResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteSubnet" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteSubnet</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteSubnetResponse</outputActionMapping>
+        <operation name="DeleteNetworkInterface" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteNetworkInterface</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteNetworkInterfaceResponse</outputActionMapping>
         </operation>
-        <operation name="ResetSnapshotAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>ResetSnapshotAttribute</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/ResetSnapshotAttributeResponse</outputActionMapping>
+        <operation name="DescribeVpcs" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeVpcs</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeVpcsResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteCustomerGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteCustomerGateway</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteCustomerGatewayResponse</outputActionMapping>
+        <operation name="DescribeLicenses" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeLicenses</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeLicensesResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteVolume" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteVolume</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteVolumeResponse</outputActionMapping>
+        <operation name="BundleInstance" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>BundleInstance</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/BundleInstanceResponse</outputActionMapping>
         </operation>
-        <operation name="StartInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>StartInstances</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/StartInstancesResponse</outputActionMapping>
+        <operation name="DescribeVpnConnections" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeVpnConnections</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeVpnConnectionsResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeAddresses" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeAddresses</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeAddressesResponse</outputActionMapping>
+        <operation name="DescribeImages" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeImages</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeImagesResponse</outputActionMapping>
         </operation>
-        <operation name="CreateSubnet" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateSubnet</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateSubnetResponse</outputActionMapping>
+        <operation name="CreateInternetGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateInternetGateway</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateInternetGatewayResponse</outputActionMapping>
         </operation>
-        <operation name="PurchaseReservedInstancesOffering" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>PurchaseReservedInstancesOffering</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/PurchaseReservedInstancesOfferingResponse</outputActionMapping>
+        <operation name="DisassociateRouteTable" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DisassociateRouteTable</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DisassociateRouteTableResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeDhcpOptions" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeDhcpOptions</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeDhcpOptionsResponse</outputActionMapping>
+        <operation name="ReplaceNetworkAclEntry" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ReplaceNetworkAclEntry</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ReplaceNetworkAclEntryResponse</outputActionMapping>
         </operation>
-        <operation name="CreateVpnConnection" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateVpnConnection</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateVpnConnectionResponse</outputActionMapping>
+        <operation name="AuthorizeSecurityGroupIngress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>AuthorizeSecurityGroupIngress</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AuthorizeSecurityGroupIngressResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeImageAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeImageAttribute</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeImageAttributeResponse</outputActionMapping>
+        <operation name="DescribeSnapshotAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeSnapshotAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeSnapshotAttributeResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeInstances</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeInstancesResponse</outputActionMapping>
+        <operation name="CreateVpnGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateVpnGateway</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateVpnGatewayResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteDhcpOptions" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteDhcpOptions</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteDhcpOptionsResponse</outputActionMapping>
+        <operation name="ResetInstanceAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ResetInstanceAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ResetInstanceAttributeResponse</outputActionMapping>
         </operation>
-        <operation name="CreateSnapshot" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateSnapshot</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateSnapshotResponse</outputActionMapping>
+        <operation name="CreateTags" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateTags</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateTagsResponse</outputActionMapping>
         </operation>
-        <operation name="CreateDhcpOptions" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateDhcpOptions</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateDhcpOptionsResponse</outputActionMapping>
+        <operation name="AuthorizeSecurityGroupEgress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>AuthorizeSecurityGroupEgress</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AuthorizeSecurityGroupEgressResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeSpotPriceHistory" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeSpotPriceHistory</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeSpotPriceHistoryResponse</outputActionMapping>
+        <operation name="AssociateAddress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>AssociateAddress</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AssociateAddressResponse</outputActionMapping>
         </operation>
-        <operation name="DescribePlacementGroups" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribePlacementGroups</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribePlacementGroupsResponse</outputActionMapping>
+        <operation name="DescribeImageAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeImageAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeImageAttributeResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeLicenses" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeLicenses</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeLicensesResponse</outputActionMapping>
+        <operation name="DescribeSpotPriceHistory" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeSpotPriceHistory</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeSpotPriceHistoryResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeSpotInstanceRequests" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
+        <operation name="ModifySnapshotAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ModifySnapshotAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ModifySnapshotAttributeResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeSpotInstanceRequests" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
             <actionMapping>DescribeSpotInstanceRequests</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeSpotInstanceRequestsResponse</outputActionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeSpotInstanceRequestsResponse</outputActionMapping>
         </operation>
-        <operation name="TerminateInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>TerminateInstances</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/TerminateInstancesResponse</outputActionMapping>
+        <operation name="ImportInstance" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ImportInstance</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ImportInstanceResponse</outputActionMapping>
         </operation>
-        <operation name="RevokeSecurityGroupIngress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>RevokeSecurityGroupIngress</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/RevokeSecurityGroupIngressResponse</outputActionMapping>
+        <operation name="DescribeKeyPairs" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeKeyPairs</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeKeyPairsResponse</outputActionMapping>
         </operation>
-        <operation name="ImportKeyPair" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>ImportKeyPair</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/ImportKeyPairResponse</outputActionMapping>
+        <operation name="RevokeSecurityGroupIngress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>RevokeSecurityGroupIngress</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/RevokeSecurityGroupIngressResponse</outputActionMapping>
         </operation>
-        <operation name="CreatePlacementGroup" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
+        <operation name="CreatePlacementGroup" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
             <actionMapping>CreatePlacementGroup</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreatePlacementGroupResponse</outputActionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreatePlacementGroupResponse</outputActionMapping>
         </operation>
-        <operation name="AllocateAddress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>AllocateAddress</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/AllocateAddressResponse</outputActionMapping>
+        <operation name="DeleteNetworkAclEntry" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteNetworkAclEntry</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteNetworkAclEntryResponse</outputActionMapping>
+        </operation>
+        <operation name="ActivateLicense" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ActivateLicense</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ActivateLicenseResponse</outputActionMapping>
+        </operation>
+        <operation name="DeleteRouteTable" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteRouteTable</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteRouteTableResponse</outputActionMapping>
+        </operation>
+        <operation name="UnmonitorInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>UnmonitorInstances</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/UnmonitorInstancesResponse</outputActionMapping>
+        </operation>
+        <operation name="StartInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>StartInstances</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/StartInstancesResponse</outputActionMapping>
+        </operation>
+        <operation name="ConfirmProductInstance" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ConfirmProductInstance</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ConfirmProductInstanceResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeNetworkInterfaceAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeNetworkInterfaceAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeNetworkInterfaceAttributeResponse</outputActionMapping>
+        </operation>
+        <operation name="RunInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>RunInstances</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/RunInstancesResponse</outputActionMapping>
+        </operation>
+        <operation name="CreateReservedInstancesListing" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateReservedInstancesListing</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateReservedInstancesListingResponse</outputActionMapping>
+        </operation>
+        <operation name="CreateCustomerGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateCustomerGateway</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateCustomerGatewayResponse</outputActionMapping>
+        </operation>
+        <operation name="CreateNetworkAcl" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateNetworkAcl</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateNetworkAclResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeAvailabilityZones" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
+        <operation name="ResetImageAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ResetImageAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ResetImageAttributeResponse</outputActionMapping>
+        </operation>
+        <operation name="ModifyVolumeAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ModifyVolumeAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ModifyVolumeAttributeResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeReservedInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeReservedInstances</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeReservedInstancesResponse</outputActionMapping>
+        </operation>
+        <operation name="ResetSnapshotAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ResetSnapshotAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ResetSnapshotAttributeResponse</outputActionMapping>
+        </operation>
+        <operation name="DeleteVolume" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteVolume</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteVolumeResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeAvailabilityZones" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
             <actionMapping>DescribeAvailabilityZones</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeAvailabilityZonesResponse</outputActionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeAvailabilityZonesResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteVpnGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteVpnGateway</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteVpnGatewayResponse</outputActionMapping>
+        <operation name="CreateVpnConnection" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateVpnConnection</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateVpnConnectionResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteVpc" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteVpc</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteVpcResponse</outputActionMapping>
+        <operation name="CancelBundleTask" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CancelBundleTask</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CancelBundleTaskResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteSnapshot" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteSnapshot</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteSnapshotResponse</outputActionMapping>
+        <operation name="ReplaceNetworkAclAssociation" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ReplaceNetworkAclAssociation</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ReplaceNetworkAclAssociationResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeSubnets" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeSubnets</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeSubnetsResponse</outputActionMapping>
+        <operation name="DetachVpnGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DetachVpnGateway</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DetachVpnGatewayResponse</outputActionMapping>
         </operation>
-        <operation name="CreateVpc" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateVpc</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateVpcResponse</outputActionMapping>
+        <operation name="DescribeSnapshots" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeSnapshots</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeSnapshotsResponse</outputActionMapping>
         </operation>
-        <operation name="ActivateLicense" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>ActivateLicense</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/ActivateLicenseResponse</outputActionMapping>
+        <operation name="DeleteSubnet" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteSubnet</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteSubnetResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeSnapshotAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeSnapshotAttribute</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeSnapshotAttributeResponse</outputActionMapping>
+        <operation name="DescribeBundleTasks" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeBundleTasks</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeBundleTasksResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeTags" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeTags</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeTagsResponse</outputActionMapping>
+        <operation name="CreateKeyPair" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateKeyPair</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateKeyPairResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeVpnConnections" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeVpnConnections</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeVpnConnectionsResponse</outputActionMapping>
+        <operation name="CreateImage" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateImage</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateImageResponse</outputActionMapping>
         </operation>
-        <operation name="AuthorizeSecurityGroupIngress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>AuthorizeSecurityGroupIngress</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/AuthorizeSecurityGroupIngressResponse</outputActionMapping>
+        <operation name="EnableVgwRoutePropagation" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>EnableVgwRoutePropagation</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/EnableVgwRoutePropagationResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeReservedInstancesOfferings" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeReservedInstancesOfferings</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeReservedInstancesOfferingsResponse</outputActionMapping>
+        <operation name="UnassignPrivateIpAddresses" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>UnassignPrivateIpAddresses</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/UnassignPrivateIpAddressesResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeVpcs" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeVpcs</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeVpcsResponse</outputActionMapping>
+        <operation name="DeregisterImage" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeregisterImage</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeregisterImageResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteTags" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteTags</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteTagsResponse</outputActionMapping>
+        <operation name="DeleteVpnConnectionRoute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteVpnConnectionRoute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteVpnConnectionRouteResponse</outputActionMapping>
         </operation>
-        <operation name="UnmonitorInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>UnmonitorInstances</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/UnmonitorInstancesResponse</outputActionMapping>
+        <operation name="ModifyImageAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ModifyImageAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ModifyImageAttributeResponse</outputActionMapping>
         </operation>
-        <operation name="RebootInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>RebootInstances</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/RebootInstancesResponse</outputActionMapping>
+        <operation name="CancelConversionTask" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CancelConversionTask</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CancelConversionTaskResponse</outputActionMapping>
         </operation>
-        <operation name="AssociateDhcpOptions" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>AssociateDhcpOptions</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/AssociateDhcpOptionsResponse</outputActionMapping>
+        <operation name="DescribeVolumes" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeVolumes</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeVolumesResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeInstanceAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeInstanceAttribute</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeInstanceAttributeResponse</outputActionMapping>
+        <operation name="CancelReservedInstancesListing" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CancelReservedInstancesListing</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CancelReservedInstancesListingResponse</outputActionMapping>
+        </operation>
+        <operation name="GetPasswordData" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>GetPasswordData</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/GetPasswordDataResponse</outputActionMapping>
+        </operation>
+        <operation name="AllocateAddress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>AllocateAddress</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AllocateAddressResponse</outputActionMapping>
         </operation>
-        <operation name="DeletePlacementGroup" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
+        <operation name="DeleteSecurityGroup" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteSecurityGroup</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteSecurityGroupResponse</outputActionMapping>
+        </operation>
+        <operation name="DeletePlacementGroup" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
             <actionMapping>DeletePlacementGroup</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeletePlacementGroupResponse</outputActionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeletePlacementGroupResponse</outputActionMapping>
         </operation>
-        <operation name="CreateKeyPair" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateKeyPair</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateKeyPairResponse</outputActionMapping>
+        <operation name="DisassociateAddress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DisassociateAddress</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DisassociateAddressResponse</outputActionMapping>
         </operation>
-        <operation name="BundleInstance" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>BundleInstance</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/BundleInstanceResponse</outputActionMapping>
+        <operation name="DeleteDhcpOptions" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteDhcpOptions</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteDhcpOptionsResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeSpotDatafeedSubscription" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeSpotDatafeedSubscription</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeSpotDatafeedSubscriptionResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeNetworkAcls" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeNetworkAcls</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeNetworkAclsResponse</outputActionMapping>
         </operation>
-        <operation name="AttachVpnGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
+        <operation name="EnableVolumeIO" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>EnableVolumeIO</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/EnableVolumeIOResponse</outputActionMapping>
+        </operation>
+        <operation name="AttachVpnGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
             <actionMapping>AttachVpnGateway</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/AttachVpnGatewayResponse</outputActionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AttachVpnGatewayResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeKeyPairs" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeKeyPairs</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeKeyPairsResponse</outputActionMapping>
+        <operation name="DescribeInternetGateways" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeInternetGateways</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeInternetGatewaysResponse</outputActionMapping>
         </operation>
-        <operation name="ResetImageAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>ResetImageAttribute</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/ResetImageAttributeResponse</outputActionMapping>
+        <operation name="DescribeDhcpOptions" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeDhcpOptions</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeDhcpOptionsResponse</outputActionMapping>
         </operation>
-        <operation name="CreateTags" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateTags</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateTagsResponse</outputActionMapping>
+        <operation name="CreateSpotDatafeedSubscription" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateSpotDatafeedSubscription</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateSpotDatafeedSubscriptionResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeVolumes" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeVolumes</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeVolumesResponse</outputActionMapping>
+        <operation name="DescribeReservedInstancesListings" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeReservedInstancesListings</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeReservedInstancesListingsResponse</outputActionMapping>
         </operation>
-        <operation name="DetachVpnGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DetachVpnGateway</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DetachVpnGatewayResponse</outputActionMapping>
+        <operation name="DescribeInstanceStatus" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeInstanceStatus</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeInstanceStatusResponse</outputActionMapping>
         </operation>
-        <operation name="CancelBundleTask" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CancelBundleTask</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CancelBundleTaskResponse</outputActionMapping>
+        <operation name="ModifyNetworkInterfaceAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ModifyNetworkInterfaceAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ModifyNetworkInterfaceAttributeResponse</outputActionMapping>
         </operation>
-        <operation name="GetConsoleOutput" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>GetConsoleOutput</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/GetConsoleOutputResponse</outputActionMapping>
+        <operation name="DisableVgwRoutePropagation" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DisableVgwRoutePropagation</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DisableVgwRoutePropagationResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeVolumeStatus" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeVolumeStatus</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeVolumeStatusResponse</outputActionMapping>
+        </operation>
+        <operation name="DetachNetworkInterface" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DetachNetworkInterface</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DetachNetworkInterfaceResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeSecurityGroups" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeSecurityGroups</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeSecurityGroupsResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeInstances</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeInstancesResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeNetworkInterfaces" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeNetworkInterfaces</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeNetworkInterfacesResponse</outputActionMapping>
+        </operation>
+        <operation name="DeleteKeyPair" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteKeyPair</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteKeyPairResponse</outputActionMapping>
+        </operation>
+        <operation name="CreateSnapshot" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateSnapshot</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateSnapshotResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeVpnGateways" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeVpnGateways</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeVpnGatewaysResponse</outputActionMapping>
+        </operation>
+        <operation name="DeleteTags" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteTags</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteTagsResponse</outputActionMapping>
+        </operation>
+        <operation name="DeleteSnapshot" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteSnapshot</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteSnapshotResponse</outputActionMapping>
+        </operation>
+        <operation name="DeleteCustomerGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteCustomerGateway</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteCustomerGatewayResponse</outputActionMapping>
+        </operation>
+        <operation name="CreateVolume" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateVolume</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateVolumeResponse</outputActionMapping>
+        </operation>
+        <operation name="CancelExportTask" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CancelExportTask</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CancelExportTaskResponse</outputActionMapping>
         </operation>
-        <operation name="DetachVolume" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
+        <operation name="RegisterImage" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>RegisterImage</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/RegisterImageResponse</outputActionMapping>
+        </operation>
+        <operation name="DetachVolume" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
             <actionMapping>DetachVolume</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DetachVolumeResponse</outputActionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DetachVolumeResponse</outputActionMapping>
         </operation>
-        <operation name="RunInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>RunInstances</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/RunInstancesResponse</outputActionMapping>
+        <operation name="StopInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>StopInstances</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/StopInstancesResponse</outputActionMapping>
         </operation>
-        <operation name="ResetInstanceAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>ResetInstanceAttribute</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/ResetInstanceAttributeResponse</outputActionMapping>
+        <operation name="CreateRoute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateRoute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateRouteResponse</outputActionMapping>
+        </operation>
+        <operation name="ReleaseAddress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ReleaseAddress</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ReleaseAddressResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeCustomerGateways" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
+        <operation name="DescribeRouteTables" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeRouteTables</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeRouteTablesResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeCustomerGateways" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
             <actionMapping>DescribeCustomerGateways</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeCustomerGatewaysResponse</outputActionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeCustomerGatewaysResponse</outputActionMapping>
         </operation>
-        <operation name="AssociateAddress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>AssociateAddress</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/AssociateAddressResponse</outputActionMapping>
+        <operation name="DeleteNetworkAcl" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteNetworkAcl</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteNetworkAclResponse</outputActionMapping>
         </operation>
-        <operation name="ReleaseAddress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>ReleaseAddress</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/ReleaseAddressResponse</outputActionMapping>
+        <operation name="DeleteRoute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteRoute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteRouteResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteSpotDatafeedSubscription" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteSpotDatafeedSubscription</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteSpotDatafeedSubscriptionResponse</outputActionMapping>
+        <operation name="RebootInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>RebootInstances</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/RebootInstancesResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeSecurityGroups" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeSecurityGroups</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeSecurityGroupsResponse</outputActionMapping>
+        <operation name="ModifyInstanceAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ModifyInstanceAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ModifyInstanceAttributeResponse</outputActionMapping>
         </operation>
-        <operation name="CreateImage" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateImage</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateImageResponse</outputActionMapping>
+        <operation name="TerminateInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>TerminateInstances</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/TerminateInstancesResponse</outputActionMapping>
         </operation>
-        <operation name="GetPasswordData" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>GetPasswordData</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/GetPasswordDataResponse</outputActionMapping>
+        <operation name="CreateVpnConnectionRoute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateVpnConnectionRoute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateVpnConnectionRouteResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeBundleTasks" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeBundleTasks</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeBundleTasksResponse</outputActionMapping>
+        <operation name="DescribeConversionTasks" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeConversionTasks</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeConversionTasksResponse</outputActionMapping>
         </operation>
-        <operation name="AttachVolume" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>AttachVolume</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/AttachVolumeResponse</outputActionMapping>
+        <operation name="DescribeAddresses" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeAddresses</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeAddressesResponse</outputActionMapping>
         </operation>
-        <operation name="DisassociateAddress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DisassociateAddress</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DisassociateAddressResponse</outputActionMapping>
+        <operation name="DescribeInstanceAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeInstanceAttribute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeInstanceAttributeResponse</outputActionMapping>
         </operation>
-        <operation name="DeregisterImage" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeregisterImage</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeregisterImageResponse</outputActionMapping>
+        <operation name="AttachInternetGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>AttachInternetGateway</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AttachInternetGatewayResponse</outputActionMapping>
         </operation>
-        <operation name="DeleteVpnConnection" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeleteVpnConnection</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeleteVpnConnectionResponse</outputActionMapping>
+        <operation name="CreateVpc" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateVpc</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateVpcResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeImages" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeImages</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeImagesResponse</outputActionMapping>
+        <operation name="ReplaceRouteTableAssociation" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ReplaceRouteTableAssociation</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ReplaceRouteTableAssociationResponse</outputActionMapping>
         </operation>
-        <operation name="CreateSecurityGroup" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateSecurityGroup</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateSecurityGroupResponse</outputActionMapping>
+        <operation name="AssociateRouteTable" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>AssociateRouteTable</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AssociateRouteTableResponse</outputActionMapping>
         </operation>
-        <operation name="CreateVpnGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateVpnGateway</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateVpnGatewayResponse</outputActionMapping>
+        <operation name="DetachInternetGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DetachInternetGateway</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DetachInternetGatewayResponse</outputActionMapping>
         </operation>
-        <operation name="ModifySnapshotAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>ModifySnapshotAttribute</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/ModifySnapshotAttributeResponse</outputActionMapping>
+        <operation name="PurchaseReservedInstancesOffering" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>PurchaseReservedInstancesOffering</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/PurchaseReservedInstancesOfferingResponse</outputActionMapping>
         </operation>
-        <operation name="CancelSpotInstanceRequests" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CancelSpotInstanceRequests</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CancelSpotInstanceRequestsResponse</outputActionMapping>
+        <operation name="ImportVolume" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ImportVolume</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ImportVolumeResponse</outputActionMapping>
         </operation>
-        <operation name="DeactivateLicense" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DeactivateLicense</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DeactivateLicenseResponse</outputActionMapping>
+        <operation name="DescribeExportTasks" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeExportTasks</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeExportTasksResponse</outputActionMapping>
         </operation>
-        <operation name="MonitorInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>MonitorInstances</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/MonitorInstancesResponse</outputActionMapping>
+        <operation name="CreateInstanceExportTask" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateInstanceExportTask</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateInstanceExportTaskResponse</outputActionMapping>
         </operation>
-        <operation name="ModifyImageAttribute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>ModifyImageAttribute</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/ModifyImageAttributeResponse</outputActionMapping>
+        <operation name="AssignPrivateIpAddresses" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>AssignPrivateIpAddresses</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AssignPrivateIpAddressesResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeSnapshots" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeSnapshots</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeSnapshotsResponse</outputActionMapping>
+        <operation name="ReportInstanceStatus" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ReportInstanceStatus</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ReportInstanceStatusResponse</outputActionMapping>
         </operation>
-        <operation name="CreateCustomerGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>CreateCustomerGateway</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/CreateCustomerGatewayResponse</outputActionMapping>
+        <operation name="DescribeReservedInstancesOfferings" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeReservedInstancesOfferings</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeReservedInstancesOfferingsResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeSpotDatafeedSubscription" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeSpotDatafeedSubscription</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeSpotDatafeedSubscriptionResponse</outputActionMapping>
+        <operation name="DeleteVpnConnection" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteVpnConnection</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteVpnConnectionResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeReservedInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeReservedInstances</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeReservedInstancesResponse</outputActionMapping>
+        <operation name="DeleteInternetGateway" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteInternetGateway</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteInternetGatewayResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeRegions" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeRegions</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeRegionsResponse</outputActionMapping>
+        <operation name="DeleteSpotDatafeedSubscription" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DeleteSpotDatafeedSubscription</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DeleteSpotDatafeedSubscriptionResponse</outputActionMapping>
         </operation>
-        <operation name="DescribeVpnGateways" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2010-11-15/">
-            <actionMapping>DescribeVpnGateways</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2010-11-15/AmazonEC2PortType/DescribeVpnGatewaysResponse</outputActionMapping>
+        <operation name="AttachNetworkInterface" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>AttachNetworkInterface</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AttachNetworkInterfaceResponse</outputActionMapping>
+        </operation>
+        <operation name="CreateNetworkInterface" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>CreateNetworkInterface</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreateNetworkInterfaceResponse</outputActionMapping>
+        </operation>
+        <operation name="RevokeSecurityGroupEgress" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>RevokeSecurityGroupEgress</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/RevokeSecurityGroupEgressResponse</outputActionMapping>
+        </operation>
+        <operation name="MonitorInstances" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>MonitorInstances</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/MonitorInstancesResponse</outputActionMapping>
+        </operation>
+        <operation name="ReplaceRoute" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>ReplaceRoute</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/ReplaceRouteResponse</outputActionMapping>
+        </operation>
+        <operation name="AttachVolume" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>AttachVolume</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/AttachVolumeResponse</outputActionMapping>
+        </operation>
+        <operation name="GetConsoleOutput" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>GetConsoleOutput</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/GetConsoleOutputResponse</outputActionMapping>
+        </operation>
+        <operation name="DescribeRegions" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://ec2.amazonaws.com/doc/2012-08-15/">
+            <actionMapping>DescribeRegions</actionMapping>
+            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribeRegionsResponse</outputActionMapping>
         </operation>
     </service>
 </serviceGroup>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/ActivateLicense.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicense.java b/awsapi/src/com/amazon/ec2/ActivateLicense.java
index 14f2caa..83797f6 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicense.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicense.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * ActivateLicense.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,14 +17,14 @@
         implements org.apache.axis2.databinding.ADBBean{
         
                 public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
-                "http://ec2.amazonaws.com/doc/2010-11-15/",
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
                 "ActivateLicense",
                 "ns1");
 
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -343,7 +327,7 @@
                 while(!reader.isEndElement()) {
                     if (reader.isStartElement() ){
                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ActivateLicense").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ActivateLicense").equals(reader.getName())){
                                 
                                                 object.setActivateLicense(com.amazon.ec2.ActivateLicenseType.Factory.parse(reader));
                                             


[33/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
index dce1b8f..e611738 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
@@ -1,25 +1,9 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
 
 /**
  * CancelConversionTaskType.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1  Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
  */
             
                 package com.amazon.ec2;
@@ -33,13 +17,13 @@
         implements org.apache.axis2.databinding.ADBBean{
         /* This type was generated from the piece of schema that had
                 name = CancelConversionTaskType
-                Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
                 Namespace Prefix = ns1
                 */
             
 
         private static java.lang.String generatePrefix(java.lang.String namespace) {
-            if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
                 return "ns1";
             }
             return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -160,7 +144,7 @@
                   if (serializeType){
                
 
-                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/");
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
                    if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
                        writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
                            namespacePrefix+":CancelConversionTaskType",
@@ -174,7 +158,7 @@
                
                    }
                
-                                    namespace = "http://ec2.amazonaws.com/doc/2010-11-15/";
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
                                     if (! namespace.equals("")) {
                                         prefix = xmlWriter.getPrefix(namespace);
 
@@ -370,7 +354,7 @@
                  java.util.ArrayList attribList = new java.util.ArrayList();
 
                 
-                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/",
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
                                                                       "conversionTaskId"));
                                  
                                         if (localConversionTaskId != null){
@@ -457,7 +441,7 @@
                                     
                                     while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
                                 
-                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","conversionTaskId").equals(reader.getName())){
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","conversionTaskId").equals(reader.getName())){
                                 
                                     java.lang.String content = reader.getElementText();
                                     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelExportTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTask.java b/awsapi/src/com/amazon/ec2/CancelExportTask.java
new file mode 100644
index 0000000..ef47f31
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CancelExportTask.java
@@ -0,0 +1,362 @@
+
+/**
+ * CancelExportTask.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CancelExportTask bean class
+            */
+        
+        public  class CancelExportTask
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CancelExportTask",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CancelExportTask
+                        */
+
+                        
+                                    protected com.amazon.ec2.CancelExportTaskType localCancelExportTask ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CancelExportTaskType
+                           */
+                           public  com.amazon.ec2.CancelExportTaskType getCancelExportTask(){
+                               return localCancelExportTask;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CancelExportTask
+                               */
+                               public void setCancelExportTask(com.amazon.ec2.CancelExportTaskType param){
+                            
+                                            this.localCancelExportTask=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CancelExportTask.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCancelExportTask==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCancelExportTask.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCancelExportTask.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CancelExportTask parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CancelExportTask object =
+                new CancelExportTask();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CancelExportTask").equals(reader.getName())){
+                                
+                                                object.setCancelExportTask(com.amazon.ec2.CancelExportTaskType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
new file mode 100644
index 0000000..cbd4e67
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * CancelExportTaskResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CancelExportTaskResponse bean class
+            */
+        
+        public  class CancelExportTaskResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "CancelExportTaskResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for CancelExportTaskResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.CancelExportTaskResponseType localCancelExportTaskResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.CancelExportTaskResponseType
+                           */
+                           public  com.amazon.ec2.CancelExportTaskResponseType getCancelExportTaskResponse(){
+                               return localCancelExportTaskResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param CancelExportTaskResponse
+                               */
+                               public void setCancelExportTaskResponse(com.amazon.ec2.CancelExportTaskResponseType param){
+                            
+                                            this.localCancelExportTaskResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CancelExportTaskResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localCancelExportTaskResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localCancelExportTaskResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localCancelExportTaskResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CancelExportTaskResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CancelExportTaskResponse object =
+                new CancelExportTaskResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CancelExportTaskResponse").equals(reader.getName())){
+                                
+                                                object.setCancelExportTaskResponse(com.amazon.ec2.CancelExportTaskResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
new file mode 100644
index 0000000..8283680
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * CancelExportTaskResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CancelExportTaskResponseType bean class
+            */
+        
+        public  class CancelExportTaskResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CancelExportTaskResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CancelExportTaskResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CancelExportTaskResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CancelExportTaskResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CancelExportTaskResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CancelExportTaskResponseType object =
+                new CancelExportTaskResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CancelExportTaskResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CancelExportTaskResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskType.java b/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
new file mode 100644
index 0000000..c077225
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
@@ -0,0 +1,483 @@
+
+/**
+ * CancelExportTaskType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  CancelExportTaskType bean class
+            */
+        
+        public  class CancelExportTaskType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = CancelExportTaskType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for ExportTaskId
+                        */
+
+                        
+                                    protected java.lang.String localExportTaskId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getExportTaskId(){
+                               return localExportTaskId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param ExportTaskId
+                               */
+                               public void setExportTaskId(java.lang.String param){
+                            
+                                            this.localExportTaskId=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       CancelExportTaskType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":CancelExportTaskType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "CancelExportTaskType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"exportTaskId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"exportTaskId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("exportTaskId");
+                                    }
+                                
+
+                                          if (localExportTaskId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("exportTaskId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localExportTaskId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "exportTaskId"));
+                                 
+                                        if (localExportTaskId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localExportTaskId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("exportTaskId cannot be null!!");
+                                        }
+                                    
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static CancelExportTaskType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            CancelExportTaskType object =
+                new CancelExportTaskType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"CancelExportTaskType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (CancelExportTaskType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","exportTaskId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setExportTaskId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[57/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SubnetSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SubnetSetType.java b/awsapi/src/com/amazon/ec2/SubnetSetType.java
index 0f4bce9..cbba79d 100644
--- a/awsapi/src/com/amazon/ec2/SubnetSetType.java
+++ b/awsapi/src/com/amazon/ec2/SubnetSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SubnetSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/SubnetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SubnetType.java b/awsapi/src/com/amazon/ec2/SubnetType.java
index c154ae1..3d89c39 100644
--- a/awsapi/src/com/amazon/ec2/SubnetType.java
+++ b/awsapi/src/com/amazon/ec2/SubnetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * SubnetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/TagSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TagSetItemType.java b/awsapi/src/com/amazon/ec2/TagSetItemType.java
index ee39bdd..429260b 100644
--- a/awsapi/src/com/amazon/ec2/TagSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/TagSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * TagSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/TagSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TagSetType.java b/awsapi/src/com/amazon/ec2/TagSetType.java
index 914b9ea..8d8e78f 100644
--- a/awsapi/src/com/amazon/ec2/TagSetType.java
+++ b/awsapi/src/com/amazon/ec2/TagSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * TagSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/TerminateInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TerminateInstances.java b/awsapi/src/com/amazon/ec2/TerminateInstances.java
index db8f17f..1eb788c 100644
--- a/awsapi/src/com/amazon/ec2/TerminateInstances.java
+++ b/awsapi/src/com/amazon/ec2/TerminateInstances.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * TerminateInstances.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java b/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java
index 65a3f52..2088313 100644
--- a/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * TerminateInstancesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java b/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java
index 48763e5..785e42b 100644
--- a/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * TerminateInstancesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/TerminateInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TerminateInstancesType.java b/awsapi/src/com/amazon/ec2/TerminateInstancesType.java
index faade16..2946dfd 100644
--- a/awsapi/src/com/amazon/ec2/TerminateInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/TerminateInstancesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * TerminateInstancesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java
index 7f47a4b..4c4d390 100644
--- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java
+++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * UnassignPrivateIpAddresses.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java
index dd25a5b..c21f381 100644
--- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java
+++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * UnassignPrivateIpAddressesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java
index 53c41ae..aef6fbb 100644
--- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * UnassignPrivateIpAddressesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java
index 6825472..7a81e77 100644
--- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java
+++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * UnassignPrivateIpAddressesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/UnmonitorInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnmonitorInstances.java b/awsapi/src/com/amazon/ec2/UnmonitorInstances.java
index abe8b17..c200728 100644
--- a/awsapi/src/com/amazon/ec2/UnmonitorInstances.java
+++ b/awsapi/src/com/amazon/ec2/UnmonitorInstances.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * UnmonitorInstances.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java b/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java
index 8e68177..b72a7dc 100644
--- a/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * UnmonitorInstancesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/UserDataType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UserDataType.java b/awsapi/src/com/amazon/ec2/UserDataType.java
index a4657de..b4db75c 100644
--- a/awsapi/src/com/amazon/ec2/UserDataType.java
+++ b/awsapi/src/com/amazon/ec2/UserDataType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * UserDataType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java b/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java
index a456dd0..eb9e933 100644
--- a/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java
+++ b/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * UserIdGroupPairSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java b/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java
index 70deac3..8e8629f 100644
--- a/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java
+++ b/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * UserIdGroupPairType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ValueSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ValueSetType.java b/awsapi/src/com/amazon/ec2/ValueSetType.java
index 060937e..8399f73 100644
--- a/awsapi/src/com/amazon/ec2/ValueSetType.java
+++ b/awsapi/src/com/amazon/ec2/ValueSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ValueSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ValueType.java b/awsapi/src/com/amazon/ec2/ValueType.java
index 669f75c..d82c828 100644
--- a/awsapi/src/com/amazon/ec2/ValueType.java
+++ b/awsapi/src/com/amazon/ec2/ValueType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ValueType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VgwTelemetryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VgwTelemetryType.java b/awsapi/src/com/amazon/ec2/VgwTelemetryType.java
index 437479c..e849de9 100644
--- a/awsapi/src/com/amazon/ec2/VgwTelemetryType.java
+++ b/awsapi/src/com/amazon/ec2/VgwTelemetryType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VgwTelemetryType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java
index a671a04..8b69b58 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VolumeStatusActionItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java
index d977ea1..54e0d03 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VolumeStatusActionsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java
index db30bf3..f8dc795 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VolumeStatusDetailsItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java
index 79e44c5..f5fe49c 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VolumeStatusDetailsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java
index 285729c..802ed97 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VolumeStatusEventItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java
index d011620..0c9af12 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VolumeStatusEventsSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java b/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java
index 84ee965..b3a1cc5 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VolumeStatusInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java
index ca672cc..8e5f550 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VolumeStatusItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java
index f70130a..c21dcb4 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VolumeStatusSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java b/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java
index 54b614b..eb5c728 100644
--- a/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpcIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpcIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpcIdSetType.java b/awsapi/src/com/amazon/ec2/VpcIdSetType.java
index ab8d188..37e9378 100644
--- a/awsapi/src/com/amazon/ec2/VpcIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpcIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpcIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpcSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpcSetType.java b/awsapi/src/com/amazon/ec2/VpcSetType.java
index 4e61274..58dd03e 100644
--- a/awsapi/src/com/amazon/ec2/VpcSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpcSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpcSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpcType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpcType.java b/awsapi/src/com/amazon/ec2/VpcType.java
index e9d73ec..b0bb89e 100644
--- a/awsapi/src/com/amazon/ec2/VpcType.java
+++ b/awsapi/src/com/amazon/ec2/VpcType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpcType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java
index edfde80..621cbcc 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnConnectionIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java
index ce45844..05a5649 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnConnectionIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java
index 486e977..70a92a8 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnConnectionOptionsRequestType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java
index a6f0e02..e2200e6 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnConnectionOptionsResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java b/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java
index 370c1c7..ba880e6 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnConnectionSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnConnectionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionType.java b/awsapi/src/com/amazon/ec2/VpnConnectionType.java
index f6cea8e..382065a 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnConnectionType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java
index ba46d72..f9b6f39 100644
--- a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnGatewayIdSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java
index e1e81e2..7a8cb93 100644
--- a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnGatewayIdSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java b/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java
index c7a9615..f6598f0 100644
--- a/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java
+++ b/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnGatewaySetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnGatewayType.java b/awsapi/src/com/amazon/ec2/VpnGatewayType.java
index f4ebfbc..fe5f912 100644
--- a/awsapi/src/com/amazon/ec2/VpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/VpnGatewayType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnGatewayType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java b/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java
index 3f1e687..1ed501e 100644
--- a/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java
+++ b/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnStaticRouteType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java b/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java
index 7b4d8cd..f70642a 100644
--- a/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnStaticRoutesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java b/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java
index c7a7a97..8483082 100644
--- a/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java
+++ b/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * VpnTunnelTelemetryType.java


[11/71] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
new file mode 100644
index 0000000..177dd91
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
@@ -0,0 +1,567 @@
+
+/**
+ * DeleteNetworkAclEntryResponseType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkAclEntryResponseType bean class
+            */
+        
+        public  class DeleteNetworkAclEntryResponseType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteNetworkAclEntryResponseType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for RequestId
+                        */
+
+                        
+                                    protected java.lang.String localRequestId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getRequestId(){
+                               return localRequestId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RequestId
+                               */
+                               public void setRequestId(java.lang.String param){
+                            
+                                            this.localRequestId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for _return
+                        */
+
+                        
+                                    protected boolean local_return ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean get_return(){
+                               return local_return;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param _return
+                               */
+                               public void set_return(boolean param){
+                            
+                                            this.local_return=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkAclEntryResponseType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteNetworkAclEntryResponseType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteNetworkAclEntryResponseType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"requestId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"requestId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("requestId");
+                                    }
+                                
+
+                                          if (localRequestId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localRequestId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"return", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"return");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("return");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("return cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "requestId"));
+                                 
+                                        if (localRequestId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRequestId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "return"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(local_return));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkAclEntryResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkAclEntryResponseType object =
+                new DeleteNetworkAclEntryResponseType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteNetworkAclEntryResponseType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteNetworkAclEntryResponseType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRequestId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","return").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.set_return(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
new file mode 100644
index 0000000..08a2901
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
@@ -0,0 +1,651 @@
+
+/**
+ * DeleteNetworkAclEntryType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkAclEntryType bean class
+            */
+        
+        public  class DeleteNetworkAclEntryType
+        implements org.apache.axis2.databinding.ADBBean{
+        /* This type was generated from the piece of schema that had
+                name = DeleteNetworkAclEntryType
+                Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/
+                Namespace Prefix = ns1
+                */
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for NetworkAclId
+                        */
+
+                        
+                                    protected java.lang.String localNetworkAclId ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return java.lang.String
+                           */
+                           public  java.lang.String getNetworkAclId(){
+                               return localNetworkAclId;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param NetworkAclId
+                               */
+                               public void setNetworkAclId(java.lang.String param){
+                            
+                                            this.localNetworkAclId=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for RuleNumber
+                        */
+
+                        
+                                    protected int localRuleNumber ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return int
+                           */
+                           public  int getRuleNumber(){
+                               return localRuleNumber;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param RuleNumber
+                               */
+                               public void setRuleNumber(int param){
+                            
+                                            this.localRuleNumber=param;
+                                    
+
+                               }
+                            
+
+                        /**
+                        * field for Egress
+                        */
+
+                        
+                                    protected boolean localEgress ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return boolean
+                           */
+                           public  boolean getEgress(){
+                               return localEgress;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param Egress
+                               */
+                               public void setEgress(boolean param){
+                            
+                                            this.localEgress=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+               org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkAclEntryType.this.serialize(parentQName,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               parentQName,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+
+
+                java.lang.String prefix = null;
+                java.lang.String namespace = null;
+                
+
+                    prefix = parentQName.getPrefix();
+                    namespace = parentQName.getNamespaceURI();
+
+                    if ((namespace != null) && (namespace.trim().length() > 0)) {
+                        java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+                        if (writerPrefix != null) {
+                            xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
+                        } else {
+                            if (prefix == null) {
+                                prefix = generatePrefix(namespace);
+                            }
+
+                            xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
+                        }
+                    } else {
+                        xmlWriter.writeStartElement(parentQName.getLocalPart());
+                    }
+                
+                  if (serializeType){
+               
+
+                   java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/");
+                   if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           namespacePrefix+":DeleteNetworkAclEntryType",
+                           xmlWriter);
+                   } else {
+                       writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+                           "DeleteNetworkAclEntryType",
+                           xmlWriter);
+                   }
+
+               
+                   }
+               
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"networkAclId", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"networkAclId");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("networkAclId");
+                                    }
+                                
+
+                                          if (localNetworkAclId==null){
+                                              // write the nil attribute
+                                              
+                                                     throw new org.apache.axis2.databinding.ADBException("networkAclId cannot be null!!");
+                                                  
+                                          }else{
+
+                                        
+                                                   xmlWriter.writeCharacters(localNetworkAclId);
+                                            
+                                          }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"ruleNumber", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"ruleNumber");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("ruleNumber");
+                                    }
+                                
+                                               if (localRuleNumber==java.lang.Integer.MIN_VALUE) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("ruleNumber cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRuleNumber));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                                    namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
+                                    if (! namespace.equals("")) {
+                                        prefix = xmlWriter.getPrefix(namespace);
+
+                                        if (prefix == null) {
+                                            prefix = generatePrefix(namespace);
+
+                                            xmlWriter.writeStartElement(prefix,"egress", namespace);
+                                            xmlWriter.writeNamespace(prefix, namespace);
+                                            xmlWriter.setPrefix(prefix, namespace);
+
+                                        } else {
+                                            xmlWriter.writeStartElement(namespace,"egress");
+                                        }
+
+                                    } else {
+                                        xmlWriter.writeStartElement("egress");
+                                    }
+                                
+                                               if (false) {
+                                           
+                                                         throw new org.apache.axis2.databinding.ADBException("egress cannot be null!!");
+                                                      
+                                               } else {
+                                                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localEgress));
+                                               }
+                                    
+                                   xmlWriter.writeEndElement();
+                             
+                    xmlWriter.writeEndElement();
+               
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                 java.util.ArrayList elementList = new java.util.ArrayList();
+                 java.util.ArrayList attribList = new java.util.ArrayList();
+
+                
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "networkAclId"));
+                                 
+                                        if (localNetworkAclId != null){
+                                            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNetworkAclId));
+                                        } else {
+                                           throw new org.apache.axis2.databinding.ADBException("networkAclId cannot be null!!");
+                                        }
+                                    
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "ruleNumber"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRuleNumber));
+                            
+                                      elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+                                                                      "egress"));
+                                 
+                                elementList.add(
+                                   org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localEgress));
+                            
+
+                return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
+            
+            
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkAclEntryType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkAclEntryType object =
+                new DeleteNetworkAclEntryType();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+                if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
+                  java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
+                        "type");
+                  if (fullTypeName!=null){
+                    java.lang.String nsPrefix = null;
+                    if (fullTypeName.indexOf(":") > -1){
+                        nsPrefix = fullTypeName.substring(0,fullTypeName.indexOf(":"));
+                    }
+                    nsPrefix = nsPrefix==null?"":nsPrefix;
+
+                    java.lang.String type = fullTypeName.substring(fullTypeName.indexOf(":")+1);
+                    
+                            if (!"DeleteNetworkAclEntryType".equals(type)){
+                                //find namespace for the prefix
+                                java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
+                                return (DeleteNetworkAclEntryType)com.amazon.ec2.ExtensionMapper.getTypeObject(
+                                     nsUri,type,reader);
+                              }
+                        
+
+                  }
+                
+
+                }
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                 
+                    
+                    reader.next();
+                
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","networkAclId").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setNetworkAclId(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ruleNumber").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setRuleNumber(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToInt(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                            
+                                    
+                                    while (!reader.isStartElement() && !reader.isEndElement()) reader.next();
+                                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","egress").equals(reader.getName())){
+                                
+                                    java.lang.String content = reader.getElementText();
+                                    
+                                              object.setEgress(
+                                                    org.apache.axis2.databinding.utils.ConverterUtil.convertToBoolean(content));
+                                              
+                                        reader.next();
+                                    
+                              }  // End of if for expected property start element
+                                
+                                else{
+                                    // A start element we are not expecting indicates an invalid parameter was passed
+                                    throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                                }
+                              
+                            while (!reader.isStartElement() && !reader.isEndElement())
+                                reader.next();
+                            
+                                if (reader.isStartElement())
+                                // A start element we are not expecting indicates a trailing invalid property
+                                throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                            
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33df54ed/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
new file mode 100644
index 0000000..160d146
--- /dev/null
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
@@ -0,0 +1,362 @@
+
+/**
+ * DeleteNetworkAclResponse.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:01:01 CEST)
+ */
+            
+                package com.amazon.ec2;
+            
+
+            /**
+            *  DeleteNetworkAclResponse bean class
+            */
+        
+        public  class DeleteNetworkAclResponse
+        implements org.apache.axis2.databinding.ADBBean{
+        
+                public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
+                "http://ec2.amazonaws.com/doc/2012-08-15/",
+                "DeleteNetworkAclResponse",
+                "ns1");
+
+            
+
+        private static java.lang.String generatePrefix(java.lang.String namespace) {
+            if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){
+                return "ns1";
+            }
+            return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+        }
+
+        
+
+                        /**
+                        * field for DeleteNetworkAclResponse
+                        */
+
+                        
+                                    protected com.amazon.ec2.DeleteNetworkAclResponseType localDeleteNetworkAclResponse ;
+                                
+
+                           /**
+                           * Auto generated getter method
+                           * @return com.amazon.ec2.DeleteNetworkAclResponseType
+                           */
+                           public  com.amazon.ec2.DeleteNetworkAclResponseType getDeleteNetworkAclResponse(){
+                               return localDeleteNetworkAclResponse;
+                           }
+
+                           
+                        
+                            /**
+                               * Auto generated setter method
+                               * @param param DeleteNetworkAclResponse
+                               */
+                               public void setDeleteNetworkAclResponse(com.amazon.ec2.DeleteNetworkAclResponseType param){
+                            
+                                            this.localDeleteNetworkAclResponse=param;
+                                    
+
+                               }
+                            
+
+     /**
+     * isReaderMTOMAware
+     * @return true if the reader supports MTOM
+     */
+   public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+        boolean isReaderMTOMAware = false;
+        
+        try{
+          isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+        }catch(java.lang.IllegalArgumentException e){
+          isReaderMTOMAware = false;
+        }
+        return isReaderMTOMAware;
+   }
+     
+     
+        /**
+        *
+        * @param parentQName
+        * @param factory
+        * @return org.apache.axiom.om.OMElement
+        */
+       public org.apache.axiom.om.OMElement getOMElement (
+               final javax.xml.namespace.QName parentQName,
+               final org.apache.axiom.om.OMFactory factory) throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                org.apache.axiom.om.OMDataSource dataSource =
+                       new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
+
+                 public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                       DeleteNetworkAclResponse.this.serialize(MY_QNAME,factory,xmlWriter);
+                 }
+               };
+               return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+               MY_QNAME,factory,dataSource);
+            
+       }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                                       final org.apache.axiom.om.OMFactory factory,
+                                       org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+                                throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+                           serialize(parentQName,factory,xmlWriter,false);
+         }
+
+         public void serialize(final javax.xml.namespace.QName parentQName,
+                               final org.apache.axiom.om.OMFactory factory,
+                               org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+                               boolean serializeType)
+            throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+            
+                
+                //We can safely assume an element has only one type associated with it
+                
+                                 if (localDeleteNetworkAclResponse==null){
+                                   throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
+                                 }
+                                 localDeleteNetworkAclResponse.serialize(MY_QNAME,factory,xmlWriter);
+                            
+
+        }
+
+         /**
+          * Util method to write an attribute with the ns prefix
+          */
+          private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+              if (xmlWriter.getPrefix(namespace) == null) {
+                       xmlWriter.writeNamespace(prefix, namespace);
+                       xmlWriter.setPrefix(prefix, namespace);
+
+              }
+
+              xmlWriter.writeAttribute(namespace,attName,attValue);
+
+         }
+
+        /**
+          * Util method to write an attribute without the ns prefix
+          */
+          private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+                                      java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+                if (namespace.equals(""))
+              {
+                  xmlWriter.writeAttribute(attName,attValue);
+              }
+              else
+              {
+                  registerPrefix(xmlWriter, namespace);
+                  xmlWriter.writeAttribute(namespace,attName,attValue);
+              }
+          }
+
+
+           /**
+             * Util method to write an attribute without the ns prefix
+             */
+            private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName,
+                                             javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+                java.lang.String attributeNamespace = qname.getNamespaceURI();
+                java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
+                if (attributePrefix == null) {
+                    attributePrefix = registerPrefix(xmlWriter, attributeNamespace);
+                }
+                java.lang.String attributeValue;
+                if (attributePrefix.trim().length() > 0) {
+                    attributeValue = attributePrefix + ":" + qname.getLocalPart();
+                } else {
+                    attributeValue = qname.getLocalPart();
+                }
+
+                if (namespace.equals("")) {
+                    xmlWriter.writeAttribute(attName, attributeValue);
+                } else {
+                    registerPrefix(xmlWriter, namespace);
+                    xmlWriter.writeAttribute(namespace, attName, attributeValue);
+                }
+            }
+        /**
+         *  method to handle Qnames
+         */
+
+        private void writeQName(javax.xml.namespace.QName qname,
+                                javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+            java.lang.String namespaceURI = qname.getNamespaceURI();
+            if (namespaceURI != null) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespaceURI);
+                if (prefix == null) {
+                    prefix = generatePrefix(namespaceURI);
+                    xmlWriter.writeNamespace(prefix, namespaceURI);
+                    xmlWriter.setPrefix(prefix,namespaceURI);
+                }
+
+                if (prefix.trim().length() > 0){
+                    xmlWriter.writeCharacters(prefix + ":" + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                } else {
+                    // i.e this is the default namespace
+                    xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+                }
+
+            } else {
+                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qname));
+            }
+        }
+
+        private void writeQNames(javax.xml.namespace.QName[] qnames,
+                                 javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+
+            if (qnames != null) {
+                // we have to store this data until last moment since it is not possible to write any
+                // namespace data after writing the charactor data
+                java.lang.StringBuffer stringToWrite = new java.lang.StringBuffer();
+                java.lang.String namespaceURI = null;
+                java.lang.String prefix = null;
+
+                for (int i = 0; i < qnames.length; i++) {
+                    if (i > 0) {
+                        stringToWrite.append(" ");
+                    }
+                    namespaceURI = qnames[i].getNamespaceURI();
+                    if (namespaceURI != null) {
+                        prefix = xmlWriter.getPrefix(namespaceURI);
+                        if ((prefix == null) || (prefix.length() == 0)) {
+                            prefix = generatePrefix(namespaceURI);
+                            xmlWriter.writeNamespace(prefix, namespaceURI);
+                            xmlWriter.setPrefix(prefix,namespaceURI);
+                        }
+
+                        if (prefix.trim().length() > 0){
+                            stringToWrite.append(prefix).append(":").append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        } else {
+                            stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                        }
+                    } else {
+                        stringToWrite.append(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(qnames[i]));
+                    }
+                }
+                xmlWriter.writeCharacters(stringToWrite.toString());
+            }
+
+        }
+
+
+         /**
+         * Register a namespace prefix
+         */
+         private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
+
+                if (prefix == null) {
+                    prefix = generatePrefix(namespace);
+
+                    while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+                        prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                    }
+
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
+                }
+
+                return prefix;
+            }
+
+
+  
+        /**
+        * databinding method to get an XML representation of this object
+        *
+        */
+        public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
+                    throws org.apache.axis2.databinding.ADBException{
+
+
+        
+                
+                //We can safely assume an element has only one type associated with it
+                return localDeleteNetworkAclResponse.getPullParser(MY_QNAME);
+
+        }
+
+  
+
+     /**
+      *  Factory class that keeps the parse method
+      */
+    public static class Factory{
+
+        
+        
+
+        /**
+        * static method to create the object
+        * Precondition:  If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
+        *                If this object is not an element, it is a complex type and the reader is at the event just after the outer start element
+        * Postcondition: If this object is an element, the reader is positioned at its end element
+        *                If this object is a complex type, the reader is positioned at the end element of its outer element
+        */
+        public static DeleteNetworkAclResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception{
+            DeleteNetworkAclResponse object =
+                new DeleteNetworkAclResponse();
+
+            int event;
+            java.lang.String nillableValue = null;
+            java.lang.String prefix ="";
+            java.lang.String namespaceuri ="";
+            try {
+                
+                while (!reader.isStartElement() && !reader.isEndElement())
+                    reader.next();
+
+                
+
+                
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
+                
+
+                    
+                while(!reader.isEndElement()) {
+                    if (reader.isStartElement() ){
+                
+                                    if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","DeleteNetworkAclResponse").equals(reader.getName())){
+                                
+                                                object.setDeleteNetworkAclResponse(com.amazon.ec2.DeleteNetworkAclResponseType.Factory.parse(reader));
+                                            
+                              }  // End of if for expected property start element
+                                
+                             else{
+                                        // A start element we are not expecting indicates an invalid parameter was passed
+                                        throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+                             }
+                          
+                             } else {
+                                reader.next();
+                             }  
+                           }  // end of while loop
+                        
+
+
+
+            } catch (javax.xml.stream.XMLStreamException e) {
+                throw new java.lang.Exception(e);
+            }
+
+            return object;
+        }
+
+        }//end of factory class
+
+        
+
+        }
+           
+          
\ No newline at end of file


[51/71] [abbrv] [partial] git commit: updated refs/heads/master to 26af71b

Posted by li...@apache.org.
CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Signed-off-by: Likitha Shetty <li...@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/33df54ed
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33df54ed
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33df54ed

Branch: refs/heads/master
Commit: 33df54edaf6424367bc60155cb0b1e409c3e6151
Parents: e4ba348
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Jun 27 16:26:21 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Jul 4 10:01:19 2013 +0530

----------------------------------------------------------------------
 awsapi/resource/AmazonEC2/services.xml          |    764 +-
 awsapi/src/com/amazon/ec2/ActivateLicense.java  |     24 +-
 .../com/amazon/ec2/ActivateLicenseResponse.java |     24 +-
 .../amazon/ec2/ActivateLicenseResponseType.java |     36 +-
 .../src/com/amazon/ec2/ActivateLicenseType.java |     36 +-
 awsapi/src/com/amazon/ec2/AllocateAddress.java  |     24 +-
 .../com/amazon/ec2/AllocateAddressResponse.java |     24 +-
 .../amazon/ec2/AllocateAddressResponseType.java |    235 +-
 .../src/com/amazon/ec2/AllocateAddressType.java |    140 +-
 .../com/amazon/ec2/AllocationIdSetItemType.java |    483 +
 .../src/com/amazon/ec2/AllocationIdSetType.java |    560 +
 .../ec2/AmazonEC2MessageReceiverInOut.java      |  10785 +-
 .../src/com/amazon/ec2/AmazonEC2Skeleton.java   |   1558 +-
 .../amazon/ec2/AmazonEC2SkeletonInterface.java  |   1274 +-
 .../amazon/ec2/AssignPrivateIpAddresses.java    |    362 +
 .../ec2/AssignPrivateIpAddressesResponse.java   |    362 +
 .../AssignPrivateIpAddressesResponseType.java   |    567 +
 ...ignPrivateIpAddressesSetItemRequestType.java |    483 +
 .../AssignPrivateIpAddressesSetRequestType.java |    548 +
 .../ec2/AssignPrivateIpAddressesType.java       |    755 +
 awsapi/src/com/amazon/ec2/AssociateAddress.java |     24 +-
 .../amazon/ec2/AssociateAddressResponse.java    |     24 +-
 .../ec2/AssociateAddressResponseType.java       |    147 +-
 .../com/amazon/ec2/AssociateAddressType.java    |    287 +-
 .../ec2/AssociateAddressTypeChoice_type0.java   |    545 +
 .../ec2/AssociateAddressTypeChoice_type1.java   |    545 +
 .../com/amazon/ec2/AssociateDhcpOptions.java    |     24 +-
 .../ec2/AssociateDhcpOptionsResponse.java       |     24 +-
 .../ec2/AssociateDhcpOptionsResponseType.java   |     36 +-
 .../amazon/ec2/AssociateDhcpOptionsType.java    |     36 +-
 .../src/com/amazon/ec2/AssociateRouteTable.java |    362 +
 .../amazon/ec2/AssociateRouteTableResponse.java |    362 +
 .../ec2/AssociateRouteTableResponseType.java    |    575 +
 .../com/amazon/ec2/AssociateRouteTableType.java |    575 +
 .../com/amazon/ec2/AttachInternetGateway.java   |    362 +
 .../ec2/AttachInternetGatewayResponse.java      |    362 +
 .../ec2/AttachInternetGatewayResponseType.java  |    567 +
 .../amazon/ec2/AttachInternetGatewayType.java   |    575 +
 .../com/amazon/ec2/AttachNetworkInterface.java  |    362 +
 .../ec2/AttachNetworkInterfaceResponse.java     |    362 +
 .../ec2/AttachNetworkInterfaceResponseType.java |    575 +
 .../amazon/ec2/AttachNetworkInterfaceType.java  |    659 +
 awsapi/src/com/amazon/ec2/AttachVolume.java     |     24 +-
 .../com/amazon/ec2/AttachVolumeResponse.java    |     24 +-
 .../amazon/ec2/AttachVolumeResponseType.java    |     60 +-
 awsapi/src/com/amazon/ec2/AttachVolumeType.java |     42 +-
 awsapi/src/com/amazon/ec2/AttachVpnGateway.java |     24 +-
 .../amazon/ec2/AttachVpnGatewayResponse.java    |     24 +-
 .../ec2/AttachVpnGatewayResponseType.java       |     36 +-
 .../com/amazon/ec2/AttachVpnGatewayType.java    |     36 +-
 .../ec2/AttachmentSetItemResponseType.java      |     60 +-
 .../amazon/ec2/AttachmentSetResponseType.java   |     32 +-
 .../src/com/amazon/ec2/AttachmentSetType.java   |     32 +-
 awsapi/src/com/amazon/ec2/AttachmentType.java   |     36 +-
 .../amazon/ec2/AttributeBooleanValueType.java   |     30 +-
 .../src/com/amazon/ec2/AttributeValueType.java  |     30 +-
 .../ec2/AuthorizeSecurityGroupEgress.java       |    362 +
 .../AuthorizeSecurityGroupEgressResponse.java   |    362 +
 ...uthorizeSecurityGroupEgressResponseType.java |    567 +
 .../ec2/AuthorizeSecurityGroupEgressType.java   |    544 +
 .../ec2/AuthorizeSecurityGroupIngress.java      |     24 +-
 .../AuthorizeSecurityGroupIngressResponse.java  |     24 +-
 ...thorizeSecurityGroupIngressResponseType.java |     36 +-
 .../ec2/AuthorizeSecurityGroupIngressType.java  |    154 +-
 ...izeSecurityGroupIngressTypeChoice_type0.java |    545 +
 .../amazon/ec2/AvailabilityZoneItemType.java    |     48 +-
 .../ec2/AvailabilityZoneMessageSetType.java     |     32 +-
 .../amazon/ec2/AvailabilityZoneMessageType.java |     30 +-
 .../com/amazon/ec2/AvailabilityZoneSetType.java |     32 +-
 .../amazon/ec2/BlockDeviceMappingItemType.java  |     32 +-
 .../BlockDeviceMappingItemTypeChoice_type0.java |     42 +-
 .../com/amazon/ec2/BlockDeviceMappingType.java  |     32 +-
 awsapi/src/com/amazon/ec2/BundleInstance.java   |     24 +-
 .../com/amazon/ec2/BundleInstanceResponse.java  |     24 +-
 .../amazon/ec2/BundleInstanceResponseType.java  |     36 +-
 .../amazon/ec2/BundleInstanceS3StorageType.java |     54 +-
 .../amazon/ec2/BundleInstanceTaskErrorType.java |     36 +-
 .../ec2/BundleInstanceTaskStorageType.java      |     30 +-
 .../com/amazon/ec2/BundleInstanceTaskType.java  |     72 +-
 .../amazon/ec2/BundleInstanceTasksSetType.java  |     32 +-
 .../src/com/amazon/ec2/BundleInstanceType.java  |     36 +-
 awsapi/src/com/amazon/ec2/CancelBundleTask.java |     24 +-
 .../amazon/ec2/CancelBundleTaskResponse.java    |     24 +-
 .../ec2/CancelBundleTaskResponseType.java       |     36 +-
 .../com/amazon/ec2/CancelBundleTaskType.java    |     30 +-
 .../com/amazon/ec2/CancelConversionTask.java    |     24 +-
 .../ec2/CancelConversionTaskResponse.java       |     24 +-
 .../ec2/CancelConversionTaskResponseType.java   |     36 +-
 .../amazon/ec2/CancelConversionTaskType.java    |     30 +-
 awsapi/src/com/amazon/ec2/CancelExportTask.java |    362 +
 .../amazon/ec2/CancelExportTaskResponse.java    |    362 +
 .../ec2/CancelExportTaskResponseType.java       |    567 +
 .../com/amazon/ec2/CancelExportTaskType.java    |    483 +
 .../ec2/CancelReservedInstancesListing.java     |    362 +
 .../CancelReservedInstancesListingResponse.java |    362 +
 ...celReservedInstancesListingResponseType.java |    544 +
 .../ec2/CancelReservedInstancesListingType.java |    483 +
 .../amazon/ec2/CancelSpotInstanceRequests.java  |     24 +-
 .../ec2/CancelSpotInstanceRequestsResponse.java |     24 +-
 ...SpotInstanceRequestsResponseSetItemType.java |     36 +-
 ...ncelSpotInstanceRequestsResponseSetType.java |     32 +-
 .../CancelSpotInstanceRequestsResponseType.java |     36 +-
 .../ec2/CancelSpotInstanceRequestsType.java     |     30 +-
 .../com/amazon/ec2/ConfirmProductInstance.java  |     24 +-
 .../ec2/ConfirmProductInstanceResponse.java     |     24 +-
 .../ec2/ConfirmProductInstanceResponseType.java |     42 +-
 .../amazon/ec2/ConfirmProductInstanceType.java  |     36 +-
 .../amazon/ec2/ConversionTaskIdItemType.java    |     61 +-
 .../com/amazon/ec2/ConversionTaskIdSetType.java |     32 +-
 .../com/amazon/ec2/ConversionTaskSetType.java   |     32 +-
 .../src/com/amazon/ec2/ConversionTaskType.java  |    126 +-
 .../ec2/ConversionTaskTypeChoice_type0.java     |     36 +-
 .../com/amazon/ec2/CreateCustomerGateway.java   |     24 +-
 .../ec2/CreateCustomerGatewayResponse.java      |     24 +-
 .../ec2/CreateCustomerGatewayResponseType.java  |     36 +-
 .../amazon/ec2/CreateCustomerGatewayType.java   |     76 +-
 .../src/com/amazon/ec2/CreateDhcpOptions.java   |     24 +-
 .../amazon/ec2/CreateDhcpOptionsResponse.java   |     24 +-
 .../ec2/CreateDhcpOptionsResponseType.java      |     36 +-
 .../com/amazon/ec2/CreateDhcpOptionsType.java   |     30 +-
 awsapi/src/com/amazon/ec2/CreateImage.java      |     24 +-
 .../src/com/amazon/ec2/CreateImageResponse.java |     24 +-
 .../com/amazon/ec2/CreateImageResponseType.java |     36 +-
 awsapi/src/com/amazon/ec2/CreateImageType.java  |    126 +-
 .../amazon/ec2/CreateInstanceExportTask.java    |    362 +
 .../ec2/CreateInstanceExportTaskResponse.java   |    362 +
 .../CreateInstanceExportTaskResponseType.java   |    544 +
 .../ec2/CreateInstanceExportTaskType.java       |    733 +
 ...reateInstanceExportTaskTypeChoice_type0.java |    410 +
 .../com/amazon/ec2/CreateInternetGateway.java   |    362 +
 .../ec2/CreateInternetGatewayResponse.java      |    362 +
 .../ec2/CreateInternetGatewayResponseType.java  |    544 +
 .../amazon/ec2/CreateInternetGatewayType.java   |    384 +
 awsapi/src/com/amazon/ec2/CreateKeyPair.java    |     24 +-
 .../com/amazon/ec2/CreateKeyPairResponse.java   |     24 +-
 .../amazon/ec2/CreateKeyPairResponseType.java   |     48 +-
 .../src/com/amazon/ec2/CreateKeyPairType.java   |     30 +-
 awsapi/src/com/amazon/ec2/CreateNetworkAcl.java |    362 +
 .../com/amazon/ec2/CreateNetworkAclEntry.java   |    362 +
 .../ec2/CreateNetworkAclEntryResponse.java      |    362 +
 .../ec2/CreateNetworkAclEntryResponseType.java  |    567 +
 .../amazon/ec2/CreateNetworkAclEntryType.java   |   1075 +
 .../amazon/ec2/CreateNetworkAclResponse.java    |    362 +
 .../ec2/CreateNetworkAclResponseType.java       |    544 +
 .../com/amazon/ec2/CreateNetworkAclType.java    |    483 +
 .../com/amazon/ec2/CreateNetworkInterface.java  |    362 +
 .../ec2/CreateNetworkInterfaceResponse.java     |    362 +
 .../ec2/CreateNetworkInterfaceResponseType.java |    544 +
 .../amazon/ec2/CreateNetworkInterfaceType.java  |    941 +
 .../com/amazon/ec2/CreatePlacementGroup.java    |     24 +-
 .../ec2/CreatePlacementGroupResponse.java       |     24 +-
 .../ec2/CreatePlacementGroupResponseType.java   |     36 +-
 .../amazon/ec2/CreatePlacementGroupType.java    |     36 +-
 .../ec2/CreateReservedInstancesListing.java     |    362 +
 .../CreateReservedInstancesListingResponse.java |    362 +
 ...ateReservedInstancesListingResponseType.java |    544 +
 .../ec2/CreateReservedInstancesListingType.java |    736 +
 awsapi/src/com/amazon/ec2/CreateRoute.java      |    362 +
 .../src/com/amazon/ec2/CreateRouteResponse.java |    362 +
 .../com/amazon/ec2/CreateRouteResponseType.java |    567 +
 awsapi/src/com/amazon/ec2/CreateRouteTable.java |    362 +
 .../amazon/ec2/CreateRouteTableResponse.java    |    362 +
 .../ec2/CreateRouteTableResponseType.java       |    544 +
 .../com/amazon/ec2/CreateRouteTableType.java    |    483 +
 awsapi/src/com/amazon/ec2/CreateRouteType.java  |    628 +
 .../amazon/ec2/CreateRouteTypeChoice_type0.java |    649 +
 .../src/com/amazon/ec2/CreateSecurityGroup.java |     24 +-
 .../amazon/ec2/CreateSecurityGroupResponse.java |     24 +-
 .../ec2/CreateSecurityGroupResponseType.java    |    128 +-
 .../com/amazon/ec2/CreateSecurityGroupType.java |    147 +-
 awsapi/src/com/amazon/ec2/CreateSnapshot.java   |     24 +-
 .../com/amazon/ec2/CreateSnapshotResponse.java  |     24 +-
 .../amazon/ec2/CreateSnapshotResponseType.java  |     78 +-
 .../src/com/amazon/ec2/CreateSnapshotType.java  |     36 +-
 .../ec2/CreateSpotDatafeedSubscription.java     |     24 +-
 .../CreateSpotDatafeedSubscriptionResponse.java |     24 +-
 ...ateSpotDatafeedSubscriptionResponseType.java |     36 +-
 .../ec2/CreateSpotDatafeedSubscriptionType.java |     36 +-
 awsapi/src/com/amazon/ec2/CreateSubnet.java     |     24 +-
 .../com/amazon/ec2/CreateSubnetResponse.java    |     24 +-
 .../amazon/ec2/CreateSubnetResponseType.java    |     36 +-
 awsapi/src/com/amazon/ec2/CreateSubnetType.java |     42 +-
 awsapi/src/com/amazon/ec2/CreateTags.java       |     24 +-
 .../src/com/amazon/ec2/CreateTagsResponse.java  |     24 +-
 .../com/amazon/ec2/CreateTagsResponseType.java  |     36 +-
 awsapi/src/com/amazon/ec2/CreateTagsType.java   |     36 +-
 awsapi/src/com/amazon/ec2/CreateVolume.java     |     24 +-
 .../ec2/CreateVolumePermissionItemType.java     |     36 +-
 .../ec2/CreateVolumePermissionListType.java     |     32 +-
 .../CreateVolumePermissionOperationType.java    |     36 +-
 .../com/amazon/ec2/CreateVolumeResponse.java    |     24 +-
 .../amazon/ec2/CreateVolumeResponseType.java    |    260 +-
 awsapi/src/com/amazon/ec2/CreateVolumeType.java |    253 +-
 awsapi/src/com/amazon/ec2/CreateVpc.java        |     24 +-
 .../src/com/amazon/ec2/CreateVpcResponse.java   |     24 +-
 .../com/amazon/ec2/CreateVpcResponseType.java   |     36 +-
 awsapi/src/com/amazon/ec2/CreateVpcType.java    |    141 +-
 .../src/com/amazon/ec2/CreateVpnConnection.java |     24 +-
 .../amazon/ec2/CreateVpnConnectionResponse.java |     24 +-
 .../ec2/CreateVpnConnectionResponseType.java    |     36 +-
 .../amazon/ec2/CreateVpnConnectionRoute.java    |    362 +
 .../ec2/CreateVpnConnectionRouteResponse.java   |    362 +
 .../CreateVpnConnectionRouteResponseType.java   |    567 +
 .../ec2/CreateVpnConnectionRouteType.java       |    575 +
 .../com/amazon/ec2/CreateVpnConnectionType.java |    122 +-
 awsapi/src/com/amazon/ec2/CreateVpnGateway.java |     24 +-
 .../amazon/ec2/CreateVpnGatewayResponse.java    |     24 +-
 .../ec2/CreateVpnGatewayResponseType.java       |     36 +-
 .../com/amazon/ec2/CreateVpnGatewayType.java    |     36 +-
 .../ec2/CustomerGatewayIdSetItemType.java       |     30 +-
 .../amazon/ec2/CustomerGatewayIdSetType.java    |     32 +-
 .../com/amazon/ec2/CustomerGatewaySetType.java  |     32 +-
 .../src/com/amazon/ec2/CustomerGatewayType.java |     94 +-
 .../src/com/amazon/ec2/DeactivateLicense.java   |     24 +-
 .../amazon/ec2/DeactivateLicenseResponse.java   |     24 +-
 .../ec2/DeactivateLicenseResponseType.java      |     36 +-
 .../com/amazon/ec2/DeactivateLicenseType.java   |     36 +-
 .../com/amazon/ec2/DeleteCustomerGateway.java   |     24 +-
 .../ec2/DeleteCustomerGatewayResponse.java      |     24 +-
 .../ec2/DeleteCustomerGatewayResponseType.java  |     36 +-
 .../amazon/ec2/DeleteCustomerGatewayType.java   |     30 +-
 .../src/com/amazon/ec2/DeleteDhcpOptions.java   |     24 +-
 .../amazon/ec2/DeleteDhcpOptionsResponse.java   |     24 +-
 .../ec2/DeleteDhcpOptionsResponseType.java      |     36 +-
 .../com/amazon/ec2/DeleteDhcpOptionsType.java   |     30 +-
 .../com/amazon/ec2/DeleteInternetGateway.java   |    362 +
 .../ec2/DeleteInternetGatewayResponse.java      |    362 +
 .../ec2/DeleteInternetGatewayResponseType.java  |    567 +
 .../amazon/ec2/DeleteInternetGatewayType.java   |    483 +
 awsapi/src/com/amazon/ec2/DeleteKeyPair.java    |     24 +-
 .../com/amazon/ec2/DeleteKeyPairResponse.java   |     24 +-
 .../amazon/ec2/DeleteKeyPairResponseType.java   |     36 +-
 .../src/com/amazon/ec2/DeleteKeyPairType.java   |     30 +-
 awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java |    362 +
 .../com/amazon/ec2/DeleteNetworkAclEntry.java   |    362 +
 .../ec2/DeleteNetworkAclEntryResponse.java      |    362 +
 .../ec2/DeleteNetworkAclEntryResponseType.java  |    567 +
 .../amazon/ec2/DeleteNetworkAclEntryType.java   |    651 +
 .../amazon/ec2/DeleteNetworkAclResponse.java    |    362 +
 .../ec2/DeleteNetworkAclResponseType.java       |    567 +
 .../com/amazon/ec2/DeleteNetworkAclType.java    |    483 +
 .../com/amazon/ec2/DeleteNetworkInterface.java  |    362 +
 .../ec2/DeleteNetworkInterfaceResponse.java     |    362 +
 .../ec2/DeleteNetworkInterfaceResponseType.java |    567 +
 .../amazon/ec2/DeleteNetworkInterfaceType.java  |    483 +
 .../com/amazon/ec2/DeletePlacementGroup.java    |     24 +-
 .../ec2/DeletePlacementGroupResponse.java       |     24 +-
 .../ec2/DeletePlacementGroupResponseType.java   |     36 +-
 .../amazon/ec2/DeletePlacementGroupType.java    |     30 +-
 awsapi/src/com/amazon/ec2/DeleteRoute.java      |    362 +
 .../src/com/amazon/ec2/DeleteRouteResponse.java |    362 +
 .../com/amazon/ec2/DeleteRouteResponseType.java |    567 +
 awsapi/src/com/amazon/ec2/DeleteRouteTable.java |    362 +
 .../amazon/ec2/DeleteRouteTableResponse.java    |    362 +
 .../ec2/DeleteRouteTableResponseType.java       |    567 +
 .../com/amazon/ec2/DeleteRouteTableType.java    |    483 +
 awsapi/src/com/amazon/ec2/DeleteRouteType.java  |    575 +
 .../src/com/amazon/ec2/DeleteSecurityGroup.java |     24 +-
 .../amazon/ec2/DeleteSecurityGroupResponse.java |     24 +-
 .../ec2/DeleteSecurityGroupResponseType.java    |     36 +-
 .../com/amazon/ec2/DeleteSecurityGroupType.java |    184 +-
 awsapi/src/com/amazon/ec2/DeleteSnapshot.java   |     24 +-
 .../com/amazon/ec2/DeleteSnapshotResponse.java  |     24 +-
 .../amazon/ec2/DeleteSnapshotResponseType.java  |     36 +-
 .../src/com/amazon/ec2/DeleteSnapshotType.java  |     30 +-
 .../ec2/DeleteSpotDatafeedSubscription.java     |     24 +-
 .../DeleteSpotDatafeedSubscriptionResponse.java |     24 +-
 ...eteSpotDatafeedSubscriptionResponseType.java |     36 +-
 .../ec2/DeleteSpotDatafeedSubscriptionType.java |     24 +-
 awsapi/src/com/amazon/ec2/DeleteSubnet.java     |     24 +-
 .../com/amazon/ec2/DeleteSubnetResponse.java    |     24 +-
 .../amazon/ec2/DeleteSubnetResponseType.java    |     36 +-
 awsapi/src/com/amazon/ec2/DeleteSubnetType.java |     30 +-
 awsapi/src/com/amazon/ec2/DeleteTags.java       |     24 +-
 .../src/com/amazon/ec2/DeleteTagsResponse.java  |     24 +-
 .../com/amazon/ec2/DeleteTagsResponseType.java  |     36 +-
 .../com/amazon/ec2/DeleteTagsSetItemType.java   |     36 +-
 .../src/com/amazon/ec2/DeleteTagsSetType.java   |     32 +-
 awsapi/src/com/amazon/ec2/DeleteTagsType.java   |     36 +-
 awsapi/src/com/amazon/ec2/DeleteVolume.java     |     24 +-
 .../com/amazon/ec2/DeleteVolumeResponse.java    |     24 +-
 .../amazon/ec2/DeleteVolumeResponseType.java    |     36 +-
 awsapi/src/com/amazon/ec2/DeleteVolumeType.java |     30 +-
 awsapi/src/com/amazon/ec2/DeleteVpc.java        |     24 +-
 .../src/com/amazon/ec2/DeleteVpcResponse.java   |     24 +-
 .../com/amazon/ec2/DeleteVpcResponseType.java   |     36 +-
 awsapi/src/com/amazon/ec2/DeleteVpcType.java    |     30 +-
 .../src/com/amazon/ec2/DeleteVpnConnection.java |     24 +-
 .../amazon/ec2/DeleteVpnConnectionResponse.java |     24 +-
 .../ec2/DeleteVpnConnectionResponseType.java    |     36 +-
 .../amazon/ec2/DeleteVpnConnectionRoute.java    |    362 +
 .../ec2/DeleteVpnConnectionRouteResponse.java   |    362 +
 .../DeleteVpnConnectionRouteResponseType.java   |    567 +
 .../ec2/DeleteVpnConnectionRouteType.java       |    575 +
 .../com/amazon/ec2/DeleteVpnConnectionType.java |     30 +-
 awsapi/src/com/amazon/ec2/DeleteVpnGateway.java |     24 +-
 .../amazon/ec2/DeleteVpnGatewayResponse.java    |     24 +-
 .../ec2/DeleteVpnGatewayResponseType.java       |     36 +-
 .../com/amazon/ec2/DeleteVpnGatewayType.java    |     30 +-
 awsapi/src/com/amazon/ec2/DeregisterImage.java  |     24 +-
 .../com/amazon/ec2/DeregisterImageResponse.java |     24 +-
 .../amazon/ec2/DeregisterImageResponseType.java |     36 +-
 .../src/com/amazon/ec2/DeregisterImageType.java |     30 +-
 .../src/com/amazon/ec2/DescribeAddresses.java   |     24 +-
 .../amazon/ec2/DescribeAddressesInfoType.java   |     32 +-
 .../amazon/ec2/DescribeAddressesItemType.java   |     30 +-
 .../amazon/ec2/DescribeAddressesResponse.java   |     24 +-
 .../ec2/DescribeAddressesResponseInfoType.java  |     32 +-
 .../ec2/DescribeAddressesResponseItemType.java  |    653 +-
 .../ec2/DescribeAddressesResponseType.java      |     36 +-
 .../com/amazon/ec2/DescribeAddressesType.java   |     97 +-
 .../amazon/ec2/DescribeAvailabilityZones.java   |     24 +-
 .../ec2/DescribeAvailabilityZonesResponse.java  |     24 +-
 .../DescribeAvailabilityZonesResponseType.java  |     36 +-
 .../DescribeAvailabilityZonesSetItemType.java   |     30 +-
 .../ec2/DescribeAvailabilityZonesSetType.java   |     32 +-
 .../ec2/DescribeAvailabilityZonesType.java      |     36 +-
 .../src/com/amazon/ec2/DescribeBundleTasks.java |     24 +-
 .../amazon/ec2/DescribeBundleTasksInfoType.java |     32 +-
 .../amazon/ec2/DescribeBundleTasksItemType.java |     30 +-
 .../amazon/ec2/DescribeBundleTasksResponse.java |     24 +-
 .../ec2/DescribeBundleTasksResponseType.java    |     36 +-
 .../com/amazon/ec2/DescribeBundleTasksType.java |     36 +-
 .../com/amazon/ec2/DescribeConversionTasks.java |     24 +-
 .../ec2/DescribeConversionTasksResponse.java    |     24 +-
 .../DescribeConversionTasksResponseType.java    |    122 +-
 .../amazon/ec2/DescribeConversionTasksType.java |     30 +-
 .../amazon/ec2/DescribeCustomerGateways.java    |     24 +-
 .../ec2/DescribeCustomerGatewaysResponse.java   |     24 +-
 .../DescribeCustomerGatewaysResponseType.java   |     36 +-
 .../ec2/DescribeCustomerGatewaysType.java       |     36 +-
 .../src/com/amazon/ec2/DescribeDhcpOptions.java |     24 +-
 .../amazon/ec2/DescribeDhcpOptionsResponse.java |     24 +-
 .../ec2/DescribeDhcpOptionsResponseType.java    |     36 +-
 .../com/amazon/ec2/DescribeDhcpOptionsType.java |     36 +-
 .../src/com/amazon/ec2/DescribeExportTasks.java |    362 +
 .../amazon/ec2/DescribeExportTasksResponse.java |    362 +
 .../ec2/DescribeExportTasksResponseType.java    |    544 +
 .../com/amazon/ec2/DescribeExportTasksType.java |    452 +
 .../com/amazon/ec2/DescribeImageAttribute.java  |     24 +-
 .../ec2/DescribeImageAttributeResponse.java     |     24 +-
 .../ec2/DescribeImageAttributeResponseType.java |     38 +-
 ...eImageAttributeResponseTypeChoice_type0.java |     70 +-
 .../amazon/ec2/DescribeImageAttributeType.java  |     32 +-
 .../ec2/DescribeImageAttributesGroup.java       |    133 +-
 awsapi/src/com/amazon/ec2/DescribeImages.java   |     24 +-
 .../ec2/DescribeImagesExecutableBySetType.java  |     32 +-
 .../ec2/DescribeImagesExecutableByType.java     |     30 +-
 .../com/amazon/ec2/DescribeImagesInfoType.java  |     32 +-
 .../com/amazon/ec2/DescribeImagesItemType.java  |     30 +-
 .../com/amazon/ec2/DescribeImagesOwnerType.java |     30 +-
 .../amazon/ec2/DescribeImagesOwnersType.java    |     32 +-
 .../com/amazon/ec2/DescribeImagesResponse.java  |     24 +-
 .../ec2/DescribeImagesResponseInfoType.java     |     32 +-
 .../ec2/DescribeImagesResponseItemType.java     |    150 +-
 .../amazon/ec2/DescribeImagesResponseType.java  |     36 +-
 .../src/com/amazon/ec2/DescribeImagesType.java  |     48 +-
 .../amazon/ec2/DescribeInstanceAttribute.java   |     24 +-
 .../ec2/DescribeInstanceAttributeResponse.java  |     24 +-
 .../DescribeInstanceAttributeResponseType.java  |     38 +-
 ...stanceAttributeResponseTypeChoice_type0.java |    364 +-
 .../ec2/DescribeInstanceAttributeType.java      |     32 +-
 .../ec2/DescribeInstanceAttributesGroup.java    |    364 +-
 .../com/amazon/ec2/DescribeInstanceStatus.java  |    362 +
 .../ec2/DescribeInstanceStatusResponse.java     |    362 +
 .../ec2/DescribeInstanceStatusResponseType.java |    649 +
 .../amazon/ec2/DescribeInstanceStatusType.java  |    829 +
 .../src/com/amazon/ec2/DescribeInstances.java   |     24 +-
 .../amazon/ec2/DescribeInstancesInfoType.java   |     32 +-
 .../amazon/ec2/DescribeInstancesItemType.java   |     30 +-
 .../amazon/ec2/DescribeInstancesResponse.java   |     24 +-
 .../ec2/DescribeInstancesResponseType.java      |     36 +-
 .../com/amazon/ec2/DescribeInstancesType.java   |     36 +-
 .../amazon/ec2/DescribeInternetGateways.java    |    362 +
 .../ec2/DescribeInternetGatewaysResponse.java   |    362 +
 .../DescribeInternetGatewaysResponseType.java   |    544 +
 .../ec2/DescribeInternetGatewaysType.java       |    526 +
 awsapi/src/com/amazon/ec2/DescribeKeyPairs.java |     24 +-
 .../amazon/ec2/DescribeKeyPairsInfoType.java    |     32 +-
 .../amazon/ec2/DescribeKeyPairsItemType.java    |     30 +-
 .../amazon/ec2/DescribeKeyPairsResponse.java    |     24 +-
 .../ec2/DescribeKeyPairsResponseInfoType.java   |     32 +-
 .../ec2/DescribeKeyPairsResponseItemType.java   |     36 +-
 .../ec2/DescribeKeyPairsResponseType.java       |     36 +-
 .../com/amazon/ec2/DescribeKeyPairsType.java    |     36 +-
 awsapi/src/com/amazon/ec2/DescribeLicenses.java |     24 +-
 .../amazon/ec2/DescribeLicensesResponse.java    |     24 +-
 .../ec2/DescribeLicensesResponseType.java       |     36 +-
 .../com/amazon/ec2/DescribeLicensesType.java    |     36 +-
 .../src/com/amazon/ec2/DescribeNetworkAcls.java |    362 +
 .../amazon/ec2/DescribeNetworkAclsResponse.java |    362 +
 .../ec2/DescribeNetworkAclsResponseType.java    |    544 +
 .../com/amazon/ec2/DescribeNetworkAclsType.java |    526 +
 .../ec2/DescribeNetworkInterfaceAttribute.java  |    362 +
 ...scribeNetworkInterfaceAttributeResponse.java |    362 +
 ...beNetworkInterfaceAttributeResponseType.java |    628 +
 ...erfaceAttributeResponseTypeChoice_type0.java |    629 +
 .../DescribeNetworkInterfaceAttributeType.java  |    536 +
 ...DescribeNetworkInterfaceAttributesGroup.java |    629 +
 .../amazon/ec2/DescribeNetworkInterfaces.java   |    362 +
 .../ec2/DescribeNetworkInterfacesResponse.java  |    362 +
 .../DescribeNetworkInterfacesResponseType.java  |    544 +
 .../ec2/DescribeNetworkInterfacesType.java      |    539 +
 .../ec2/DescribePlacementGroupItemType.java     |     30 +-
 .../com/amazon/ec2/DescribePlacementGroups.java |     24 +-
 .../ec2/DescribePlacementGroupsInfoType.java    |     32 +-
 .../ec2/DescribePlacementGroupsResponse.java    |     24 +-
 .../DescribePlacementGroupsResponseType.java    |     36 +-
 .../amazon/ec2/DescribePlacementGroupsType.java |     36 +-
 awsapi/src/com/amazon/ec2/DescribeRegions.java  |     24 +-
 .../com/amazon/ec2/DescribeRegionsResponse.java |     24 +-
 .../amazon/ec2/DescribeRegionsResponseType.java |     36 +-
 .../amazon/ec2/DescribeRegionsSetItemType.java  |     30 +-
 .../com/amazon/ec2/DescribeRegionsSetType.java  |     32 +-
 .../src/com/amazon/ec2/DescribeRegionsType.java |     36 +-
 .../amazon/ec2/DescribeReservedInstances.java   |     24 +-
 ...ribeReservedInstancesListingSetItemType.java |    483 +
 ...DescribeReservedInstancesListingSetType.java |    548 +
 .../ec2/DescribeReservedInstancesListings.java  |    362 +
 ...scribeReservedInstancesListingsResponse.java |    362 +
 ...vedInstancesListingsResponseSetItemType.java |   1244 +
 ...eservedInstancesListingsResponseSetType.java |    560 +
 ...beReservedInstancesListingsResponseType.java |    544 +
 .../DescribeReservedInstancesListingsType.java  |    613 +
 .../ec2/DescribeReservedInstancesOfferings.java |     24 +-
 ...cribeReservedInstancesOfferingsResponse.java |     24 +-
 ...edInstancesOfferingsResponseSetItemType.java |    577 +-
 ...servedInstancesOfferingsResponseSetType.java |     32 +-
 ...eReservedInstancesOfferingsResponseType.java |    145 +-
 ...beReservedInstancesOfferingsSetItemType.java |     30 +-
 ...scribeReservedInstancesOfferingsSetType.java |     32 +-
 .../DescribeReservedInstancesOfferingsType.java |    921 +-
 .../ec2/DescribeReservedInstancesResponse.java  |     24 +-
 ...ibeReservedInstancesResponseSetItemType.java |    440 +-
 ...escribeReservedInstancesResponseSetType.java |     32 +-
 .../DescribeReservedInstancesResponseType.java  |     36 +-
 .../DescribeReservedInstancesSetItemType.java   |     30 +-
 .../ec2/DescribeReservedInstancesSetType.java   |     32 +-
 .../ec2/DescribeReservedInstancesType.java      |    143 +-
 .../src/com/amazon/ec2/DescribeRouteTables.java |    362 +
 .../amazon/ec2/DescribeRouteTablesResponse.java |    362 +
 .../ec2/DescribeRouteTablesResponseType.java    |    544 +
 .../com/amazon/ec2/DescribeRouteTablesType.java |    526 +
 .../com/amazon/ec2/DescribeSecurityGroups.java  |     24 +-
 .../DescribeSecurityGroupsIdSetItemType.java    |    483 +
 .../ec2/DescribeSecurityGroupsIdSetType.java    |    560 +
 .../ec2/DescribeSecurityGroupsResponse.java     |     24 +-
 .../ec2/DescribeSecurityGroupsResponseType.java |     36 +-
 .../ec2/DescribeSecurityGroupsSetItemType.java  |     30 +-
 .../ec2/DescribeSecurityGroupsSetType.java      |     32 +-
 .../amazon/ec2/DescribeSecurityGroupsType.java  |    114 +-
 .../amazon/ec2/DescribeSnapshotAttribute.java   |     24 +-
 .../ec2/DescribeSnapshotAttributeResponse.java  |     24 +-
 .../DescribeSnapshotAttributeResponseType.java  |     84 +-
 ...apshotAttributeResponseTypeChoice_type0.java |    483 +
 .../ec2/DescribeSnapshotAttributeType.java      |     32 +-
 .../ec2/DescribeSnapshotAttributesGroup.java    |    103 +-
 .../src/com/amazon/ec2/DescribeSnapshots.java   |     24 +-
 .../amazon/ec2/DescribeSnapshotsOwnerType.java  |     30 +-
 .../amazon/ec2/DescribeSnapshotsOwnersType.java |     32 +-
 .../amazon/ec2/DescribeSnapshotsResponse.java   |     24 +-
 .../ec2/DescribeSnapshotsResponseType.java      |     36 +-
 .../DescribeSnapshotsRestorableBySetType.java   |     32 +-
 .../ec2/DescribeSnapshotsRestorableByType.java  |     30 +-
 .../DescribeSnapshotsSetItemResponseType.java   |     84 +-
 .../ec2/DescribeSnapshotsSetItemType.java       |     30 +-
 .../ec2/DescribeSnapshotsSetResponseType.java   |     32 +-
 .../amazon/ec2/DescribeSnapshotsSetType.java    |     32 +-
 .../com/amazon/ec2/DescribeSnapshotsType.java   |     48 +-
 .../ec2/DescribeSpotDatafeedSubscription.java   |     24 +-
 ...escribeSpotDatafeedSubscriptionResponse.java |     24 +-
 ...ibeSpotDatafeedSubscriptionResponseType.java |     36 +-
 .../DescribeSpotDatafeedSubscriptionType.java   |     24 +-
 .../ec2/DescribeSpotInstanceRequests.java       |     24 +-
 .../DescribeSpotInstanceRequestsResponse.java   |     24 +-
 ...escribeSpotInstanceRequestsResponseType.java |     36 +-
 .../ec2/DescribeSpotInstanceRequestsType.java   |     36 +-
 .../amazon/ec2/DescribeSpotPriceHistory.java    |     24 +-
 .../ec2/DescribeSpotPriceHistoryResponse.java   |     24 +-
 .../DescribeSpotPriceHistoryResponseType.java   |    145 +-
 .../ec2/DescribeSpotPriceHistoryType.java       |    371 +-
 awsapi/src/com/amazon/ec2/DescribeSubnets.java  |     24 +-
 .../com/amazon/ec2/DescribeSubnetsResponse.java |     24 +-
 .../amazon/ec2/DescribeSubnetsResponseType.java |     36 +-
 .../src/com/amazon/ec2/DescribeSubnetsType.java |     36 +-
 awsapi/src/com/amazon/ec2/DescribeTags.java     |     24 +-
 .../com/amazon/ec2/DescribeTagsResponse.java    |     24 +-
 .../amazon/ec2/DescribeTagsResponseType.java    |     36 +-
 awsapi/src/com/amazon/ec2/DescribeTagsType.java |     30 +-
 .../com/amazon/ec2/DescribeVolumeAttribute.java |    362 +
 .../ec2/DescribeVolumeAttributeResponse.java    |    362 +
 .../DescribeVolumeAttributeResponseType.java    |    628 +
 ...VolumeAttributeResponseTypeChoice_type0.java |    483 +
 .../amazon/ec2/DescribeVolumeAttributeType.java |    536 +
 .../ec2/DescribeVolumeAttributesGroup.java      |    483 +
 .../com/amazon/ec2/DescribeVolumeStatus.java    |    362 +
 .../ec2/DescribeVolumeStatusResponse.java       |    362 +
 .../ec2/DescribeVolumeStatusResponseType.java   |    649 +
 .../amazon/ec2/DescribeVolumeStatusType.java    |    736 +
 awsapi/src/com/amazon/ec2/DescribeVolumes.java  |     24 +-
 .../com/amazon/ec2/DescribeVolumesResponse.java |     24 +-
 .../amazon/ec2/DescribeVolumesResponseType.java |     36 +-
 .../ec2/DescribeVolumesSetItemResponseType.java |    264 +-
 .../amazon/ec2/DescribeVolumesSetItemType.java  |     30 +-
 .../ec2/DescribeVolumesSetResponseType.java     |     32 +-
 .../com/amazon/ec2/DescribeVolumesSetType.java  |     32 +-
 .../src/com/amazon/ec2/DescribeVolumesType.java |     36 +-
 awsapi/src/com/amazon/ec2/DescribeVpcs.java     |     24 +-
 .../com/amazon/ec2/DescribeVpcsResponse.java    |     24 +-
 .../amazon/ec2/DescribeVpcsResponseType.java    |     36 +-
 awsapi/src/com/amazon/ec2/DescribeVpcsType.java |     36 +-
 .../com/amazon/ec2/DescribeVpnConnections.java  |     24 +-
 .../ec2/DescribeVpnConnectionsResponse.java     |     24 +-
 .../ec2/DescribeVpnConnectionsResponseType.java |     36 +-
 .../amazon/ec2/DescribeVpnConnectionsType.java  |     36 +-
 .../src/com/amazon/ec2/DescribeVpnGateways.java |     24 +-
 .../amazon/ec2/DescribeVpnGatewaysResponse.java |     24 +-
 .../ec2/DescribeVpnGatewaysResponseType.java    |     36 +-
 .../com/amazon/ec2/DescribeVpnGatewaysType.java |     36 +-
 .../com/amazon/ec2/DetachInternetGateway.java   |    362 +
 .../ec2/DetachInternetGatewayResponse.java      |    362 +
 .../ec2/DetachInternetGatewayResponseType.java  |    567 +
 .../amazon/ec2/DetachInternetGatewayType.java   |    575 +
 .../com/amazon/ec2/DetachNetworkInterface.java  |    362 +
 .../ec2/DetachNetworkInterfaceResponse.java     |    362 +
 .../ec2/DetachNetworkInterfaceResponseType.java |    567 +
 .../amazon/ec2/DetachNetworkInterfaceType.java  |    581 +
 awsapi/src/com/amazon/ec2/DetachVolume.java     |     24 +-
 .../com/amazon/ec2/DetachVolumeResponse.java    |     24 +-
 .../amazon/ec2/DetachVolumeResponseType.java    |     60 +-
 awsapi/src/com/amazon/ec2/DetachVolumeType.java |     48 +-
 awsapi/src/com/amazon/ec2/DetachVpnGateway.java |     24 +-
 .../amazon/ec2/DetachVpnGatewayResponse.java    |     24 +-
 .../ec2/DetachVpnGatewayResponseType.java       |     36 +-
 .../com/amazon/ec2/DetachVpnGatewayType.java    |     36 +-
 .../ec2/DhcpConfigurationItemSetType.java       |     32 +-
 .../amazon/ec2/DhcpConfigurationItemType.java   |     36 +-
 .../amazon/ec2/DhcpOptionsIdSetItemType.java    |     30 +-
 .../com/amazon/ec2/DhcpOptionsIdSetType.java    |     32 +-
 .../src/com/amazon/ec2/DhcpOptionsSetType.java  |     32 +-
 awsapi/src/com/amazon/ec2/DhcpOptionsType.java  |     42 +-
 awsapi/src/com/amazon/ec2/DhcpValueSetType.java |     32 +-
 awsapi/src/com/amazon/ec2/DhcpValueType.java    |     30 +-
 .../amazon/ec2/DisableVgwRoutePropagation.java  |    362 +
 .../DisableVgwRoutePropagationRequestType.java  |    575 +
 .../ec2/DisableVgwRoutePropagationResponse.java |    362 +
 .../DisableVgwRoutePropagationResponseType.java |    567 +
 .../src/com/amazon/ec2/DisassociateAddress.java |     24 +-
 .../amazon/ec2/DisassociateAddressResponse.java |     24 +-
 .../ec2/DisassociateAddressResponseType.java    |     36 +-
 .../com/amazon/ec2/DisassociateAddressType.java |    186 +-
 .../com/amazon/ec2/DisassociateRouteTable.java  |    362 +
 .../ec2/DisassociateRouteTableResponse.java     |    362 +
 .../ec2/DisassociateRouteTableResponseType.java |    567 +
 .../amazon/ec2/DisassociateRouteTableType.java  |    483 +
 .../amazon/ec2/DiskImageDescriptionType.java    |     48 +-
 .../src/com/amazon/ec2/DiskImageDetailType.java |     42 +-
 awsapi/src/com/amazon/ec2/DiskImageSetType.java |     32 +-
 awsapi/src/com/amazon/ec2/DiskImageType.java    |     42 +-
 .../ec2/DiskImageVolumeDescriptionType.java     |     36 +-
 .../src/com/amazon/ec2/DiskImageVolumeType.java |     30 +-
 .../src/com/amazon/ec2/EbsBlockDeviceType.java  |    247 +-
 ...sInstanceBlockDeviceMappingResponseType.java |     48 +-
 awsapi/src/com/amazon/ec2/EmptyElementType.java |     24 +-
 .../amazon/ec2/EnableVgwRoutePropagation.java   |    362 +
 .../EnableVgwRoutePropagationRequestType.java   |    575 +
 .../ec2/EnableVgwRoutePropagationResponse.java  |    362 +
 .../EnableVgwRoutePropagationResponseType.java  |    567 +
 awsapi/src/com/amazon/ec2/EnableVolumeIO.java   |    362 +
 .../com/amazon/ec2/EnableVolumeIOResponse.java  |    362 +
 .../amazon/ec2/EnableVolumeIOResponseType.java  |    567 +
 .../src/com/amazon/ec2/EnableVolumeIOType.java  |    483 +
 .../src/com/amazon/ec2/ExportTaskIdSetType.java |    560 +
 awsapi/src/com/amazon/ec2/ExportTaskIdType.java |    483 +
 .../com/amazon/ec2/ExportTaskResponseType.java  |    891 +
 .../ec2/ExportTaskResponseTypeChoice_type0.java |    410 +
 .../ec2/ExportTaskResponseTypeChoice_type1.java |    410 +
 .../amazon/ec2/ExportTaskSetResponseType.java   |    560 +
 .../amazon/ec2/ExportToS3TaskResponseType.java  |    772 +
 .../src/com/amazon/ec2/ExportToS3TaskType.java  |    785 +
 awsapi/src/com/amazon/ec2/ExtensionMapper.java  |   4368 +-
 awsapi/src/com/amazon/ec2/FilterSetType.java    |     32 +-
 awsapi/src/com/amazon/ec2/FilterType.java       |     36 +-
 awsapi/src/com/amazon/ec2/GetConsoleOutput.java |     24 +-
 .../amazon/ec2/GetConsoleOutputResponse.java    |     24 +-
 .../ec2/GetConsoleOutputResponseType.java       |     48 +-
 .../com/amazon/ec2/GetConsoleOutputType.java    |     30 +-
 awsapi/src/com/amazon/ec2/GetPasswordData.java  |     24 +-
 .../com/amazon/ec2/GetPasswordDataResponse.java |     24 +-
 .../amazon/ec2/GetPasswordDataResponseType.java |     48 +-
 .../src/com/amazon/ec2/GetPasswordDataType.java |     30 +-
 awsapi/src/com/amazon/ec2/GroupItemType.java    |    166 +-
 awsapi/src/com/amazon/ec2/GroupSetType.java     |     32 +-
 .../ec2/IamInstanceProfileRequestType.java      |    601 +
 .../ec2/IamInstanceProfileResponseType.java     |    575 +
 awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java |    559 +
 awsapi/src/com/amazon/ec2/ImportInstance.java   |     24 +-
 .../amazon/ec2/ImportInstanceGroupItemType.java |    601 +
 .../amazon/ec2/ImportInstanceGroupSetType.java  |    560 +
 .../ImportInstanceLaunchSpecificationType.java  |     88 +-
 .../com/amazon/ec2/ImportInstanceResponse.java  |     24 +-
 .../amazon/ec2/ImportInstanceResponseType.java  |    122 +-
 .../ec2/ImportInstanceTaskDetailsType.java      |     48 +-
 .../src/com/amazon/ec2/ImportInstanceType.java  |    150 +-
 .../ec2/ImportInstanceVolumeDetailItemType.java |     66 +-
 .../ec2/ImportInstanceVolumeDetailSetType.java  |     32 +-
 awsapi/src/com/amazon/ec2/ImportKeyPair.java    |     24 +-
 .../com/amazon/ec2/ImportKeyPairResponse.java   |     24 +-
 .../amazon/ec2/ImportKeyPairResponseType.java   |     42 +-
 .../src/com/amazon/ec2/ImportKeyPairType.java   |     36 +-
 awsapi/src/com/amazon/ec2/ImportVolume.java     |     24 +-
 .../com/amazon/ec2/ImportVolumeResponse.java    |     24 +-
 .../amazon/ec2/ImportVolumeResponseType.java    |    122 +-
 .../amazon/ec2/ImportVolumeTaskDetailsType.java |     54 +-
 awsapi/src/com/amazon/ec2/ImportVolumeType.java |     48 +-
 .../ec2/InstanceBlockDeviceMappingItemType.java |     32 +-
 ...eBlockDeviceMappingItemTypeChoice_type0.java |     42 +-
 ...tanceBlockDeviceMappingResponseItemType.java |     32 +-
 ...viceMappingResponseItemTypeChoice_type0.java |     30 +-
 .../InstanceBlockDeviceMappingResponseType.java |     32 +-
 .../ec2/InstanceBlockDeviceMappingType.java     |     32 +-
 .../amazon/ec2/InstanceCountsSetItemType.java   |    567 +
 .../com/amazon/ec2/InstanceCountsSetType.java   |    548 +
 .../amazon/ec2/InstanceEbsBlockDeviceType.java  |     36 +-
 .../ec2/InstanceExportTaskResponseType.java     |    588 +
 .../src/com/amazon/ec2/InstanceIdSetType.java   |     32 +-
 awsapi/src/com/amazon/ec2/InstanceIdType.java   |     30 +-
 .../amazon/ec2/InstanceLicenseRequestType.java  |     30 +-
 .../amazon/ec2/InstanceLicenseResponseType.java |     30 +-
 .../amazon/ec2/InstanceMonitoringStateType.java |     30 +-
 ...InstanceNetworkInterfaceAssociationType.java |    588 +
 .../InstanceNetworkInterfaceAttachmentType.java |    835 +
 ...tanceNetworkInterfaceSetItemRequestType.java |   1241 +
 .../InstanceNetworkInterfaceSetItemType.java    |   1573 +
 .../InstanceNetworkInterfaceSetRequestType.java |    560 +
 .../ec2/InstanceNetworkInterfaceSetType.java    |    560 +
 .../com/amazon/ec2/InstancePlacementType.java   |     36 +-
 .../InstancePrivateIpAddressesSetItemType.java  |    668 +
 .../ec2/InstancePrivateIpAddressesSetType.java  |    560 +
 .../amazon/ec2/InstanceStateChangeSetType.java  |     32 +-
 .../com/amazon/ec2/InstanceStateChangeType.java |     42 +-
 .../src/com/amazon/ec2/InstanceStateType.java   |     36 +-
 .../ec2/InstanceStatusDetailsSetItemType.java   |    680 +
 .../ec2/InstanceStatusDetailsSetType.java       |    560 +
 .../com/amazon/ec2/InstanceStatusEventType.java |    772 +
 .../amazon/ec2/InstanceStatusEventsSetType.java |    560 +
 .../com/amazon/ec2/InstanceStatusItemType.java  |    832 +
 .../com/amazon/ec2/InstanceStatusSetType.java   |    560 +
 .../src/com/amazon/ec2/InstanceStatusType.java  |    557 +
 .../com/amazon/ec2/InstanceTypeSetItemType.java |     30 +-
 .../src/com/amazon/ec2/InstanceTypeSetType.java |     32 +-
 .../ec2/InternetGatewayAttachmentSetType.java   |    560 +
 .../ec2/InternetGatewayAttachmentType.java      |    575 +
 .../ec2/InternetGatewayIdSetItemType.java       |    483 +
 .../amazon/ec2/InternetGatewayIdSetType.java    |    560 +
 .../com/amazon/ec2/InternetGatewaySetType.java  |    560 +
 .../src/com/amazon/ec2/InternetGatewayType.java |    618 +
 .../src/com/amazon/ec2/IpPermissionSetType.java |     32 +-
 awsapi/src/com/amazon/ec2/IpPermissionType.java |    118 +-
 awsapi/src/com/amazon/ec2/IpRangeItemType.java  |     30 +-
 awsapi/src/com/amazon/ec2/IpRangeSetType.java   |     32 +-
 .../amazon/ec2/LaunchPermissionItemType.java    |     36 +-
 .../amazon/ec2/LaunchPermissionListType.java    |     32 +-
 .../ec2/LaunchPermissionOperationType.java      |     36 +-
 .../ec2/LaunchSpecificationRequestType.java     |    352 +-
 .../ec2/LaunchSpecificationResponseType.java    |    346 +-
 .../amazon/ec2/LicenseCapacitySetItemType.java  |     48 +-
 .../com/amazon/ec2/LicenseCapacitySetType.java  |     32 +-
 .../com/amazon/ec2/LicenseIdSetItemType.java    |     30 +-
 awsapi/src/com/amazon/ec2/LicenseIdSetType.java |     32 +-
 .../src/com/amazon/ec2/LicenseSetItemType.java  |     54 +-
 awsapi/src/com/amazon/ec2/LicenseSetType.java   |     32 +-
 .../com/amazon/ec2/ModifyImageAttribute.java    |     24 +-
 .../ec2/ModifyImageAttributeResponse.java       |     24 +-
 .../ec2/ModifyImageAttributeResponseType.java   |     36 +-
 .../amazon/ec2/ModifyImageAttributeType.java    |     32 +-
 .../ModifyImageAttributeTypeChoice_type0.java   |     42 +-
 .../com/amazon/ec2/ModifyInstanceAttribute.java |     24 +-
 .../ec2/ModifyInstanceAttributeResponse.java    |     24 +-
 .../ModifyInstanceAttributeResponseType.java    |     36 +-
 .../amazon/ec2/ModifyInstanceAttributeType.java |     32 +-
 ...ModifyInstanceAttributeTypeChoice_type0.java |    285 +-
 .../ModifyNetworkInterfaceAttachmentType.java   |    567 +
 .../ec2/ModifyNetworkInterfaceAttribute.java    |    362 +
 ...ModifyNetworkInterfaceAttributeResponse.java |    362 +
 ...fyNetworkInterfaceAttributeResponseType.java |    567 +
 .../ModifyNetworkInterfaceAttributeType.java    |    536 +
 ...tworkInterfaceAttributeTypeChoice_type0.java |    629 +
 .../com/amazon/ec2/ModifySnapshotAttribute.java |     24 +-
 .../ec2/ModifySnapshotAttributeResponse.java    |     24 +-
 .../ModifySnapshotAttributeResponseType.java    |     36 +-
 .../amazon/ec2/ModifySnapshotAttributeType.java |     36 +-
 .../com/amazon/ec2/ModifyVolumeAttribute.java   |    362 +
 .../ec2/ModifyVolumeAttributeResponse.java      |    362 +
 .../ec2/ModifyVolumeAttributeResponseType.java  |    567 +
 .../amazon/ec2/ModifyVolumeAttributeType.java   |    536 +
 .../ModifyVolumeAttributeTypeChoice_type0.java  |    410 +
 awsapi/src/com/amazon/ec2/MonitorInstances.java |     24 +-
 .../amazon/ec2/MonitorInstancesResponse.java    |     24 +-
 .../MonitorInstancesResponseSetItemType.java    |     36 +-
 .../ec2/MonitorInstancesResponseSetType.java    |     32 +-
 .../ec2/MonitorInstancesResponseType.java       |     36 +-
 .../amazon/ec2/MonitorInstancesSetItemType.java |     30 +-
 .../com/amazon/ec2/MonitorInstancesSetType.java |     32 +-
 .../com/amazon/ec2/MonitorInstancesType.java    |     30 +-
 .../com/amazon/ec2/MonitoringInstanceType.java  |     30 +-
 .../ec2/NetworkAclAssociationSetType.java       |    560 +
 .../amazon/ec2/NetworkAclAssociationType.java   |    667 +
 .../com/amazon/ec2/NetworkAclEntrySetType.java  |    560 +
 .../src/com/amazon/ec2/NetworkAclEntryType.java |    983 +
 .../com/amazon/ec2/NetworkAclIdSetItemType.java |    483 +
 .../src/com/amazon/ec2/NetworkAclIdSetType.java |    560 +
 .../src/com/amazon/ec2/NetworkAclSetType.java   |    560 +
 awsapi/src/com/amazon/ec2/NetworkAclType.java   |    855 +
 .../ec2/NetworkInterfaceAssociationType.java    |    798 +
 .../ec2/NetworkInterfaceAttachmentType.java     |   1045 +
 .../ec2/NetworkInterfaceIdSetItemType.java      |    483 +
 .../amazon/ec2/NetworkInterfaceIdSetType.java   |    560 +
 ...kInterfacePrivateIpAddressesSetItemType.java |    641 +
 ...tworkInterfacePrivateIpAddressesSetType.java |    560 +
 .../com/amazon/ec2/NetworkInterfaceSetType.java |    560 +
 .../com/amazon/ec2/NetworkInterfaceType.java    |   2020 +
 .../ec2/NullableAttributeBooleanValueType.java  |     30 +-
 .../amazon/ec2/NullableAttributeValueType.java  |     30 +-
 .../com/amazon/ec2/PlacementGroupInfoType.java  |     42 +-
 .../com/amazon/ec2/PlacementGroupSetType.java   |     32 +-
 .../com/amazon/ec2/PlacementRequestType.java    |    141 +-
 .../com/amazon/ec2/PlacementResponseType.java   |    141 +-
 awsapi/src/com/amazon/ec2/PortRangeType.java    |    559 +
 .../ec2/PriceScheduleRequestSetItemType.java    |    664 +
 .../amazon/ec2/PriceScheduleRequestSetType.java |    548 +
 .../amazon/ec2/PriceScheduleSetItemType.java    |    748 +
 .../com/amazon/ec2/PriceScheduleSetType.java    |    560 +
 .../amazon/ec2/PricingDetailsSetItemType.java   |    559 +
 .../com/amazon/ec2/PricingDetailsSetType.java   |    560 +
 .../PrivateIpAddressesSetItemRequestType.java   |    581 +
 .../ec2/PrivateIpAddressesSetRequestType.java   |    560 +
 .../src/com/amazon/ec2/ProductCodeItemType.java |     84 +-
 .../src/com/amazon/ec2/ProductCodeListType.java |     32 +-
 .../src/com/amazon/ec2/ProductCodeSetType.java  |    576 -
 awsapi/src/com/amazon/ec2/ProductCodeType.java  |    499 -
 .../com/amazon/ec2/ProductCodesSetItemType.java |    122 +-
 .../src/com/amazon/ec2/ProductCodesSetType.java |     32 +-
 .../ec2/ProductDescriptionSetItemType.java      |     30 +-
 .../amazon/ec2/ProductDescriptionSetType.java   |     32 +-
 .../com/amazon/ec2/PropagatingVgwSetType.java   |    560 +
 .../src/com/amazon/ec2/PropagatingVgwType.java  |    483 +
 .../ec2/PurchaseReservedInstancesOffering.java  |     24 +-
 ...rchaseReservedInstancesOfferingResponse.java |     24 +-
 ...seReservedInstancesOfferingResponseType.java |     36 +-
 .../PurchaseReservedInstancesOfferingType.java  |    114 +-
 awsapi/src/com/amazon/ec2/RebootInstances.java  |     24 +-
 .../com/amazon/ec2/RebootInstancesInfoType.java |     32 +-
 .../com/amazon/ec2/RebootInstancesItemType.java |     30 +-
 .../com/amazon/ec2/RebootInstancesResponse.java |     24 +-
 .../amazon/ec2/RebootInstancesResponseType.java |     36 +-
 .../src/com/amazon/ec2/RebootInstancesType.java |     30 +-
 .../amazon/ec2/RecurringChargesSetItemType.java |    567 +
 .../com/amazon/ec2/RecurringChargesSetType.java |    560 +
 awsapi/src/com/amazon/ec2/RegionItemType.java   |     36 +-
 awsapi/src/com/amazon/ec2/RegionSetType.java    |     32 +-
 awsapi/src/com/amazon/ec2/RegisterImage.java    |     24 +-
 .../com/amazon/ec2/RegisterImageResponse.java   |     24 +-
 .../amazon/ec2/RegisterImageResponseType.java   |     36 +-
 .../src/com/amazon/ec2/RegisterImageType.java   |     72 +-
 awsapi/src/com/amazon/ec2/ReleaseAddress.java   |     24 +-
 .../com/amazon/ec2/ReleaseAddressResponse.java  |     24 +-
 .../amazon/ec2/ReleaseAddressResponseType.java  |     36 +-
 .../src/com/amazon/ec2/ReleaseAddressType.java  |    113 +-
 .../ec2/ReleaseAddressTypeChoice_type0.java     |    545 +
 .../ec2/ReplaceNetworkAclAssociation.java       |    362 +
 .../ReplaceNetworkAclAssociationResponse.java   |    362 +
 ...eplaceNetworkAclAssociationResponseType.java |    575 +
 .../ec2/ReplaceNetworkAclAssociationType.java   |    575 +
 .../com/amazon/ec2/ReplaceNetworkAclEntry.java  |    362 +
 .../ec2/ReplaceNetworkAclEntryResponse.java     |    362 +
 .../ec2/ReplaceNetworkAclEntryResponseType.java |    567 +
 .../amazon/ec2/ReplaceNetworkAclEntryType.java  |   1075 +
 awsapi/src/com/amazon/ec2/ReplaceRoute.java     |    362 +
 .../com/amazon/ec2/ReplaceRouteResponse.java    |    362 +
 .../amazon/ec2/ReplaceRouteResponseType.java    |    567 +
 .../ec2/ReplaceRouteTableAssociation.java       |    362 +
 .../ReplaceRouteTableAssociationResponse.java   |    362 +
 ...eplaceRouteTableAssociationResponseType.java |    575 +
 .../ec2/ReplaceRouteTableAssociationType.java   |    575 +
 awsapi/src/com/amazon/ec2/ReplaceRouteType.java |    628 +
 .../ec2/ReplaceRouteTypeChoice_type0.java       |    649 +
 .../com/amazon/ec2/ReportInstanceStatus.java    |    362 +
 ...portInstanceStatusReasonCodeSetItemType.java |    483 +
 .../ReportInstanceStatusReasonCodesSetType.java |    548 +
 .../ec2/ReportInstanceStatusResponse.java       |    362 +
 .../ec2/ReportInstanceStatusResponseType.java   |    567 +
 .../amazon/ec2/ReportInstanceStatusType.java    |    920 +
 .../com/amazon/ec2/RequestSpotInstances.java    |     24 +-
 .../ec2/RequestSpotInstancesResponse.java       |     24 +-
 .../ec2/RequestSpotInstancesResponseType.java   |     36 +-
 .../amazon/ec2/RequestSpotInstancesType.java    |     72 +-
 .../src/com/amazon/ec2/ReservationInfoType.java |     54 +-
 .../src/com/amazon/ec2/ReservationSetType.java  |     32 +-
 .../ec2/ReservedInstanceLimitPriceType.java     |    580 +
 .../src/com/amazon/ec2/ResetImageAttribute.java |     24 +-
 .../amazon/ec2/ResetImageAttributeResponse.java |     24 +-
 .../ec2/ResetImageAttributeResponseType.java    |     36 +-
 .../com/amazon/ec2/ResetImageAttributeType.java |     32 +-
 .../amazon/ec2/ResetImageAttributesGroup.java   |     30 +-
 .../com/amazon/ec2/ResetInstanceAttribute.java  |     24 +-
 .../ec2/ResetInstanceAttributeResponse.java     |     24 +-
 .../ec2/ResetInstanceAttributeResponseType.java |     36 +-
 .../amazon/ec2/ResetInstanceAttributeType.java  |     32 +-
 .../ec2/ResetInstanceAttributesGroup.java       |    109 +-
 .../ec2/ResetNetworkInterfaceAttribute.java     |    362 +
 .../ResetNetworkInterfaceAttributeResponse.java |    362 +
 ...etNetworkInterfaceAttributeResponseType.java |    567 +
 .../ec2/ResetNetworkInterfaceAttributeType.java |    536 +
 .../ResetNetworkInterfaceAttributesGroup.java   |    410 +
 .../com/amazon/ec2/ResetSnapshotAttribute.java  |     24 +-
 .../ec2/ResetSnapshotAttributeResponse.java     |     24 +-
 .../ec2/ResetSnapshotAttributeResponseType.java |     36 +-
 .../amazon/ec2/ResetSnapshotAttributeType.java  |     32 +-
 .../ec2/ResetSnapshotAttributesGroup.java       |     30 +-
 .../com/amazon/ec2/ResourceIdSetItemType.java   |     30 +-
 .../src/com/amazon/ec2/ResourceIdSetType.java   |     32 +-
 .../com/amazon/ec2/ResourceTagSetItemType.java  |     36 +-
 .../src/com/amazon/ec2/ResourceTagSetType.java  |     32 +-
 .../amazon/ec2/RevokeSecurityGroupEgress.java   |    362 +
 .../ec2/RevokeSecurityGroupEgressResponse.java  |    362 +
 .../RevokeSecurityGroupEgressResponseType.java  |    567 +
 .../ec2/RevokeSecurityGroupEgressType.java      |    544 +
 .../amazon/ec2/RevokeSecurityGroupIngress.java  |     24 +-
 .../ec2/RevokeSecurityGroupIngressResponse.java |     24 +-
 .../RevokeSecurityGroupIngressResponseType.java |     36 +-
 .../ec2/RevokeSecurityGroupIngressType.java     |    154 +-
 ...okeSecurityGroupIngressTypeChoice_type0.java |    545 +
 awsapi/src/com/amazon/ec2/RouteSetType.java     |    560 +
 .../ec2/RouteTableAssociationSetType.java       |    560 +
 .../amazon/ec2/RouteTableAssociationType.java   |    628 +
 .../RouteTableAssociationTypeChoice_type0.java  |    538 +
 .../com/amazon/ec2/RouteTableIdSetItemType.java |    483 +
 .../src/com/amazon/ec2/RouteTableIdSetType.java |    560 +
 .../src/com/amazon/ec2/RouteTableSetType.java   |    560 +
 awsapi/src/com/amazon/ec2/RouteTableType.java   |    832 +
 awsapi/src/com/amazon/ec2/RouteType.java        |   1087 +
 awsapi/src/com/amazon/ec2/RunInstances.java     |     24 +-
 .../com/amazon/ec2/RunInstancesResponse.java    |     24 +-
 .../amazon/ec2/RunInstancesResponseType.java    |     60 +-
 awsapi/src/com/amazon/ec2/RunInstancesType.java |    596 +-
 .../amazon/ec2/RunningInstancesItemType.java    |    625 +-
 .../com/amazon/ec2/RunningInstancesSetType.java |     32 +-
 .../amazon/ec2/SecurityGroupIdSetItemType.java  |    483 +
 .../com/amazon/ec2/SecurityGroupIdSetType.java  |    560 +
 .../com/amazon/ec2/SecurityGroupItemType.java   |    403 +-
 .../com/amazon/ec2/SecurityGroupSetType.java    |     32 +-
 .../ec2/SpotDatafeedSubscriptionType.java       |     54 +-
 .../ec2/SpotInstanceRequestIdSetItemType.java   |     30 +-
 .../ec2/SpotInstanceRequestIdSetType.java       |     32 +-
 .../ec2/SpotInstanceRequestSetItemType.java     |    215 +-
 .../amazon/ec2/SpotInstanceRequestSetType.java  |     32 +-
 .../amazon/ec2/SpotInstanceStateFaultType.java  |     36 +-
 .../amazon/ec2/SpotPlacementRequestType.java    |    601 +
 .../amazon/ec2/SpotPriceHistorySetItemType.java |    159 +-
 .../com/amazon/ec2/SpotPriceHistorySetType.java |     32 +-
 awsapi/src/com/amazon/ec2/StartInstances.java   |     24 +-
 .../com/amazon/ec2/StartInstancesResponse.java  |     24 +-
 .../amazon/ec2/StartInstancesResponseType.java  |     36 +-
 .../src/com/amazon/ec2/StartInstancesType.java  |     30 +-
 awsapi/src/com/amazon/ec2/StateReasonType.java  |     36 +-
 awsapi/src/com/amazon/ec2/StopInstances.java    |     24 +-
 .../com/amazon/ec2/StopInstancesResponse.java   |     24 +-
 .../amazon/ec2/StopInstancesResponseType.java   |     36 +-
 .../src/com/amazon/ec2/StopInstancesType.java   |     36 +-
 .../src/com/amazon/ec2/SubnetIdSetItemType.java |     30 +-
 awsapi/src/com/amazon/ec2/SubnetIdSetType.java  |     32 +-
 awsapi/src/com/amazon/ec2/SubnetSetType.java    |     32 +-
 awsapi/src/com/amazon/ec2/SubnetType.java       |     66 +-
 awsapi/src/com/amazon/ec2/TagSetItemType.java   |     48 +-
 awsapi/src/com/amazon/ec2/TagSetType.java       |     32 +-
 .../src/com/amazon/ec2/TerminateInstances.java  |     24 +-
 .../amazon/ec2/TerminateInstancesResponse.java  |     24 +-
 .../ec2/TerminateInstancesResponseType.java     |     36 +-
 .../com/amazon/ec2/TerminateInstancesType.java  |     30 +-
 .../amazon/ec2/UnassignPrivateIpAddresses.java  |    362 +
 .../ec2/UnassignPrivateIpAddressesResponse.java |    362 +
 .../UnassignPrivateIpAddressesResponseType.java |    567 +
 .../ec2/UnassignPrivateIpAddressesType.java     |    544 +
 .../src/com/amazon/ec2/UnmonitorInstances.java  |     24 +-
 .../amazon/ec2/UnmonitorInstancesResponse.java  |     24 +-
 awsapi/src/com/amazon/ec2/UserDataType.java     |     30 +-
 .../com/amazon/ec2/UserIdGroupPairSetType.java  |     32 +-
 .../src/com/amazon/ec2/UserIdGroupPairType.java |    199 +-
 awsapi/src/com/amazon/ec2/ValueSetType.java     |     32 +-
 awsapi/src/com/amazon/ec2/ValueType.java        |     30 +-
 awsapi/src/com/amazon/ec2/VgwTelemetryType.java |    560 +
 .../amazon/ec2/VolumeStatusActionItemType.java  |    759 +
 .../amazon/ec2/VolumeStatusActionsSetType.java  |    560 +
 .../amazon/ec2/VolumeStatusDetailsItemType.java |    575 +
 .../amazon/ec2/VolumeStatusDetailsSetType.java  |    560 +
 .../amazon/ec2/VolumeStatusEventItemType.java   |    851 +
 .../amazon/ec2/VolumeStatusEventsSetType.java   |    560 +
 .../com/amazon/ec2/VolumeStatusInfoType.java    |    544 +
 .../com/amazon/ec2/VolumeStatusItemType.java    |    758 +
 .../src/com/amazon/ec2/VolumeStatusSetType.java |    560 +
 awsapi/src/com/amazon/ec2/VpcIdSetItemType.java |     30 +-
 awsapi/src/com/amazon/ec2/VpcIdSetType.java     |     32 +-
 awsapi/src/com/amazon/ec2/VpcSetType.java       |     32 +-
 awsapi/src/com/amazon/ec2/VpcType.java          |    161 +-
 .../amazon/ec2/VpnConnectionIdSetItemType.java  |     30 +-
 .../com/amazon/ec2/VpnConnectionIdSetType.java  |     32 +-
 .../ec2/VpnConnectionOptionsRequestType.java    |    489 +
 .../ec2/VpnConnectionOptionsResponseType.java   |    489 +
 .../com/amazon/ec2/VpnConnectionSetType.java    |     32 +-
 .../src/com/amazon/ec2/VpnConnectionType.java   |    288 +-
 .../com/amazon/ec2/VpnGatewayIdSetItemType.java |     30 +-
 .../src/com/amazon/ec2/VpnGatewayIdSetType.java |     32 +-
 .../src/com/amazon/ec2/VpnGatewaySetType.java   |     32 +-
 awsapi/src/com/amazon/ec2/VpnGatewayType.java   |     91 +-
 .../src/com/amazon/ec2/VpnStaticRouteType.java  |    667 +
 .../com/amazon/ec2/VpnStaticRoutesSetType.java  |    560 +
 .../com/amazon/ec2/VpnTunnelTelemetryType.java  |    856 +
 .../ec2/client/AmazonEC2CallbackHandler.java    |   1930 +-
 .../com/amazon/ec2/client/AmazonEC2Stub.java    | 387641 ++++++++++++----
 920 files changed, 489080 insertions(+), 120245 deletions(-)
----------------------------------------------------------------------



[59/71] [abbrv] CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files [Support for EC2 API version 2012-08-15]

Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ProductCodeListType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductCodeListType.java b/awsapi/src/com/amazon/ec2/ProductCodeListType.java
index 098a8ad..42a2330 100644
--- a/awsapi/src/com/amazon/ec2/ProductCodeListType.java
+++ b/awsapi/src/com/amazon/ec2/ProductCodeListType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ProductCodeListType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java b/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java
index 21d17c1..89967bd 100644
--- a/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ProductCodesSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ProductCodesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductCodesSetType.java b/awsapi/src/com/amazon/ec2/ProductCodesSetType.java
index a52072e..c3c6e4b 100644
--- a/awsapi/src/com/amazon/ec2/ProductCodesSetType.java
+++ b/awsapi/src/com/amazon/ec2/ProductCodesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ProductCodesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java b/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java
index 8a23096..008eed6 100644
--- a/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ProductDescriptionSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java b/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java
index dfea062..3f6479c 100644
--- a/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java
+++ b/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ProductDescriptionSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java b/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java
index 428c1f4..ba3662b 100644
--- a/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java
+++ b/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PropagatingVgwSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PropagatingVgwType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PropagatingVgwType.java b/awsapi/src/com/amazon/ec2/PropagatingVgwType.java
index a33a83e..6b6215c 100644
--- a/awsapi/src/com/amazon/ec2/PropagatingVgwType.java
+++ b/awsapi/src/com/amazon/ec2/PropagatingVgwType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PropagatingVgwType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java
index 7452266..cb3392c 100644
--- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java
+++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PurchaseReservedInstancesOffering.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java
index 045efac..becbd12 100644
--- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java
+++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PurchaseReservedInstancesOfferingResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java
index a768e98..e056098 100644
--- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java
+++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PurchaseReservedInstancesOfferingResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java
index 827b94b..89293f9 100644
--- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java
+++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * PurchaseReservedInstancesOfferingType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RebootInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstances.java b/awsapi/src/com/amazon/ec2/RebootInstances.java
index 0f5743e..70e3e3a 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstances.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstances.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RebootInstances.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java b/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java
index c7c1bc0..a32756f 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RebootInstancesInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java b/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java
index 0ebc273..37e846b 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RebootInstancesItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java b/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java
index e454de6..71e8aac 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RebootInstancesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java b/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java
index 51befef..004ee5e 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RebootInstancesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RebootInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesType.java b/awsapi/src/com/amazon/ec2/RebootInstancesType.java
index 66f0131..b3f0ff1 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstancesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RebootInstancesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java b/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java
index 11f3b8e..396a806 100644
--- a/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RecurringChargesSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java b/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java
index d1e7b6a..349f410 100644
--- a/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java
+++ b/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RecurringChargesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RegionItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegionItemType.java b/awsapi/src/com/amazon/ec2/RegionItemType.java
index e654bb8..ada35a0 100644
--- a/awsapi/src/com/amazon/ec2/RegionItemType.java
+++ b/awsapi/src/com/amazon/ec2/RegionItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RegionItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RegionSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegionSetType.java b/awsapi/src/com/amazon/ec2/RegionSetType.java
index 02d35c1..3c4f256 100644
--- a/awsapi/src/com/amazon/ec2/RegionSetType.java
+++ b/awsapi/src/com/amazon/ec2/RegionSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RegionSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RegisterImage.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegisterImage.java b/awsapi/src/com/amazon/ec2/RegisterImage.java
index 95ce235..6312cf1 100644
--- a/awsapi/src/com/amazon/ec2/RegisterImage.java
+++ b/awsapi/src/com/amazon/ec2/RegisterImage.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RegisterImage.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RegisterImageResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegisterImageResponse.java b/awsapi/src/com/amazon/ec2/RegisterImageResponse.java
index c4f0311..b849bad 100644
--- a/awsapi/src/com/amazon/ec2/RegisterImageResponse.java
+++ b/awsapi/src/com/amazon/ec2/RegisterImageResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RegisterImageResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java b/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java
index d89891f..110bac5 100644
--- a/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RegisterImageResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RegisterImageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegisterImageType.java b/awsapi/src/com/amazon/ec2/RegisterImageType.java
index 9cab256..c953a96 100644
--- a/awsapi/src/com/amazon/ec2/RegisterImageType.java
+++ b/awsapi/src/com/amazon/ec2/RegisterImageType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RegisterImageType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReleaseAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddress.java b/awsapi/src/com/amazon/ec2/ReleaseAddress.java
index f2b8416..9abf128 100644
--- a/awsapi/src/com/amazon/ec2/ReleaseAddress.java
+++ b/awsapi/src/com/amazon/ec2/ReleaseAddress.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReleaseAddress.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java b/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java
index d63b3d0..bd72a8f 100644
--- a/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReleaseAddressResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java b/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java
index 00a59d9..6baf16b 100644
--- a/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReleaseAddressResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReleaseAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressType.java b/awsapi/src/com/amazon/ec2/ReleaseAddressType.java
index 19d4e5a..71c978d 100644
--- a/awsapi/src/com/amazon/ec2/ReleaseAddressType.java
+++ b/awsapi/src/com/amazon/ec2/ReleaseAddressType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReleaseAddressType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java
index e446bcc..1afdc6a 100644
--- a/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReleaseAddressTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java
index 3d3e629..820166b 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceNetworkAclAssociation.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java
index ed74f96..1350114 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceNetworkAclAssociationResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java
index 3015d9d..5732cbb 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceNetworkAclAssociationResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java
index c37d65f..8a64c42 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceNetworkAclAssociationType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java
index 43ec4d2..5a1e2e0 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceNetworkAclEntry.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java
index c9e2eaa..90c961a 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceNetworkAclEntryResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java
index 7dd9617..0e0a63a 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceNetworkAclEntryResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java
index d85d48e..ed4f612 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceNetworkAclEntryType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRoute.java b/awsapi/src/com/amazon/ec2/ReplaceRoute.java
index e5e87aa..2ae5511 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRoute.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRoute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceRoute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java b/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java
index 7b9b4ed..9175c10 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceRouteResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java
index 31fe5f3..cb2fd1d 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceRouteResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java
index 254d843..c1b10fe 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceRouteTableAssociation.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java
index a9f3616..a768f26 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceRouteTableAssociationResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java
index ff3dd64..bf92da6 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceRouteTableAssociationResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java
index 30688e6..e9d2a84 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceRouteTableAssociationType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteType.java
index 7bf4006..c7b4900 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceRouteType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java
index f07f171..0dd0b0b 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReplaceRouteTypeChoice_type0.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java
index 7b7cbe7..50694e6 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReportInstanceStatus.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java
index 01c9fab..884a6bc 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReportInstanceStatusReasonCodeSetItemType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java
index ce9b2b6..5d91a00 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReportInstanceStatusReasonCodesSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java
index 069f4cc..d9bd1a7 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReportInstanceStatusResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java
index d5ef74c..e08972e 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReportInstanceStatusResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java
index 0c56bf7..3739942 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReportInstanceStatusType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RequestSpotInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstances.java b/awsapi/src/com/amazon/ec2/RequestSpotInstances.java
index 71f374c..a05f184 100644
--- a/awsapi/src/com/amazon/ec2/RequestSpotInstances.java
+++ b/awsapi/src/com/amazon/ec2/RequestSpotInstances.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RequestSpotInstances.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java
index b88793b..1c45812 100644
--- a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RequestSpotInstancesResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java
index 152701f..8af8976 100644
--- a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RequestSpotInstancesResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java b/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java
index c7df529..6144aa5 100644
--- a/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * RequestSpotInstancesType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReservationInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReservationInfoType.java b/awsapi/src/com/amazon/ec2/ReservationInfoType.java
index 8c87ba4..4bd8b01 100644
--- a/awsapi/src/com/amazon/ec2/ReservationInfoType.java
+++ b/awsapi/src/com/amazon/ec2/ReservationInfoType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReservationInfoType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReservationSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReservationSetType.java b/awsapi/src/com/amazon/ec2/ReservationSetType.java
index a9b913f..b8ca44f 100644
--- a/awsapi/src/com/amazon/ec2/ReservationSetType.java
+++ b/awsapi/src/com/amazon/ec2/ReservationSetType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReservationSetType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java b/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java
index 1ee198f..37dc82e 100644
--- a/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java
+++ b/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ReservedInstanceLimitPriceType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetImageAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttribute.java b/awsapi/src/com/amazon/ec2/ResetImageAttribute.java
index 66f3b20..236d65e 100644
--- a/awsapi/src/com/amazon/ec2/ResetImageAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ResetImageAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetImageAttribute.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java
index 62b4a13..cb3307d 100644
--- a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetImageAttributeResponse.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java
index b43d7c3..896aa19 100644
--- a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetImageAttributeResponseType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java b/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java
index 06e2b5e..339e74e 100644
--- a/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetImageAttributeType.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java
index c08c8db..e09d804 100644
--- a/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetImageAttributesGroup.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26af71b2/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java
index 021dcd1..69056eb 100644
--- a/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ResetInstanceAttribute.java